From 36a34c7aa21527cf101532a73249bfb04dad4b57 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 25 Sep 2014 16:12:11 +0000 Subject: [PATCH] Make forced include of config file work with clang. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4368 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4831d33d5..7869dc11f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,8 +317,7 @@ set (wsjtx_UISRCS Configuration.ui ) -set (all_C_and_CXXSRCS - ${wsjt_CSRCS} +set (all_CXXSRCS ${wsjt_CXXSRCS} ${wsjt_qt_CXXSRCS} ${jt9_CXXSRCS} @@ -326,6 +325,11 @@ set (all_C_and_CXXSRCS ${wsjtx_CXXSRCS} ) +set (all_C_and_CXXSRCS + ${wsjt_CSRCS} + ${all_CXXSRCS} + ) + if (APPLE) set (WSJTX_ICON_FILE ${CMAKE_PROJECT_NAME}.icns) set (ICONSRCS @@ -355,7 +359,7 @@ if (NOT WSJT_QDEBUG_IN_RELEASE) set_directory_properties (PROPERTIES COMPILE_DEFINITIONS_MINSIZEREL "QT_NO_DEBUG_OUTPUT;QT_NO_WARNING_OUTPUT") endif (NOT WSJT_QDEBUG_IN_RELEASE) -set_property (SOURCE ${all_C_and_CXXSRCS} APPEND PROPERTY COMPILE_FLAGS "-include wsjtx_config.h") +set_property (SOURCE ${all_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h") set_property (SOURCE ${all_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS wsjtx_config.h) if (WIN32)