patch.diff
nolden (Marco Nolden)
Actions

Authored By

	nolden
	Mar 20 2020, 11:42 AM

Size

1 KB

Referenced Files

None

Subscribers

None

patch.diff
View Options

	From 6c50a58be0d6cbf1597e6757df7e99d84a9e6d8c Mon Sep 17 00:00:00 2001
	From: Sven Lafebre <s.lafebre@runbox.com>
	Date: Thu, 19 Mar 2020 15:41:55 +0100
	Subject: [PATCH] Add support for MITK_SHOW_CONSOLE_WINDOW and
	WINDOWS_ICON_RESOURCE_FILE when using mitk_create_executable, to match
	existing functionality in BlueBerry-based executables

	---
	CMake/mitkFunctionCreateModule.cmake \| 9 +++++++--
	1 file changed, 7 insertions(+), 2 deletions(-)

	diff --git a/CMake/mitkFunctionCreateModule.cmake b/CMake/mitkFunctionCreateModule.cmake
	index bd7a674562..afa6c7bf85 100644
	--- a/CMake/mitkFunctionCreateModule.cmake
	+++ b/CMake/mitkFunctionCreateModule.cmake
	@@ -456,9 +456,14 @@ function(mitk_create_module)
	set_property(TARGET ${MODULE_TARGET} PROPERTY FOLDER "${MITK_ROOT_FOLDER}/Modules")
	else()
	if(MODULE_EXECUTABLE)
	- add_executable(${MODULE_TARGET}
	+ if(MITK_SHOW_CONSOLE_WINDOW)
	+ set(_SHOW_CONSOLE_OPTION "")
	+ else()
	+ set(_SHOW_CONSOLE_OPTION WIN32)
	+ endif()
	+ add_executable(${MODULE_TARGET} ${_SHOW_CONSOLE_OPTION}
	${MODULE_CPP_FILES} ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP}
	- ${DOX_FILES} ${UI_FILES} ${QRC_FILES})
	+ ${DOX_FILES} ${UI_FILES} ${QRC_FILES} ${WINDOWS_ICON_RESOURCE_FILE})
	set_property(TARGET ${MODULE_TARGET} PROPERTY FOLDER "${MITK_ROOT_FOLDER}/Modules/Executables")
	set(_us_module_name main)
	else()
	--
	2.20.1.windows.1