From 91b5e4a486e101b03ade690994b5fe3e10bd22b3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 16 Nov 2021 15:25:37 +0300 Subject: [PATCH 1/2] debug build without WIN32 --- SHSTKQtMacros.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SHSTKQtMacros.cmake b/SHSTKQtMacros.cmake index da12291..7a81cb8 100644 --- a/SHSTKQtMacros.cmake +++ b/SHSTKQtMacros.cmake @@ -138,7 +138,11 @@ macro(shstk_qad_project NAME IS_APP DOMAIN _MODULES _LIBS) qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC}) #message("add_exe proj ${NAME}, ${${DOMAIN}_DOMAIN}.${PROJECT_NAME}") if (${IS_APP}) - qad_add_executable(${PROJECT_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) + if (CMAKE_BUILD_TYPE MATCHES Debug) + qad_add_executable(${PROJECT_NAME} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) + else() + qad_add_executable(${PROJECT_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) + endif() else() set(_libtype SHARED) if (NOT "x${${DOMAIN}_LIB_TYPE}" STREQUAL "x") From f0f0b85c0468d089ebeab661d098ac8f846a19f5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 16 Nov 2021 15:29:24 +0300 Subject: [PATCH 2/2] remove copypaste --- SHSTKQtMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SHSTKQtMacros.cmake b/SHSTKQtMacros.cmake index 7a81cb8..6d99849 100644 --- a/SHSTKQtMacros.cmake +++ b/SHSTKQtMacros.cmake @@ -138,11 +138,11 @@ macro(shstk_qad_project NAME IS_APP DOMAIN _MODULES _LIBS) qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC}) #message("add_exe proj ${NAME}, ${${DOMAIN}_DOMAIN}.${PROJECT_NAME}") if (${IS_APP}) + set(_DEBUG_FLAG_) if (CMAKE_BUILD_TYPE MATCHES Debug) - qad_add_executable(${PROJECT_NAME} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) - else() - qad_add_executable(${PROJECT_NAME} WIN32 out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) + set(_DEBUG_FLAG_ "WIN32") endif() + qad_add_executable(${PROJECT_NAME} ${_DEBUG_FLAG_} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN}) else() set(_libtype SHARED) if (NOT "x${${DOMAIN}_LIB_TYPE}" STREQUAL "x")