summaryrefslogtreecommitdiffstats
path: root/Source/CMakeLists.txt
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-10-19 06:54:18 (GMT)
committerDaniel Pfeifer <daniel@pfeifer-mail.de>2016-10-21 16:14:50 (GMT)
commitf69e768d94ff5e0238cbb924836737c4ce11a930 (patch)
tree88d4d5f0725b81517779456a6a2c9dd9136a5297 /Source/CMakeLists.txt
parent1e555a44aa4e3d40bca2f88915c9f957098e5a55 (diff)
downloadCMake-f69e768d94ff5e0238cbb924836737c4ce11a930.zip
CMake-f69e768d94ff5e0238cbb924836737c4ce11a930.tar.gz
CMake-f69e768d94ff5e0238cbb924836737c4ce11a930.tar.bz2
Separate compilation for commands included in cmCommands
Diffstat (limited to 'Source/CMakeLists.txt')
-rw-r--r--Source/CMakeLists.txt15
1 files changed, 5 insertions, 10 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 2b8c17c..9f8a3e2 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -401,9 +401,8 @@ set(SRCS
cm_codecvt.cxx
)
-set(COMMAND_INCLUDES "#include \"cmTargetPropCommandBase.cxx\"\n")
-list(APPEND SRCS cmTargetPropCommandBase.cxx)
-set_property(SOURCE cmTargetPropCommandBase.cxx PROPERTY HEADER_FILE_ONLY ON)
+set(COMMAND_INCLUDES "#include \"cmTargetPropCommandBase.h\"\n")
+list(APPEND SRCS cmTargetPropCommandBase.cxx cmTargetPropCommandBase.h)
set(NEW_COMMANDS "")
foreach(command_file
cmAddCompileOptionsCommand
@@ -418,6 +417,7 @@ foreach(command_file
cmInstallProgramsCommand
cmLinkLibrariesCommand
cmLoadCacheCommand
+ cmLoadCommandCommand
cmOutputRequiredFilesCommand
cmQTWrapCPPCommand
cmQTWrapUICommand
@@ -435,15 +435,10 @@ foreach(command_file
cmVariableRequiresCommand
cmVariableWatchCommand
cmWriteFileCommand
- # This one must be last because it includes windows.h and
- # windows.h #defines GetCurrentDirectory which is a member
- # of cmMakefile
- cmLoadCommandCommand
)
- set(COMMAND_INCLUDES "${COMMAND_INCLUDES}#include \"${command_file}.cxx\"\n")
+ set(COMMAND_INCLUDES "${COMMAND_INCLUDES}#include \"${command_file}.h\"\n")
set(NEW_COMMANDS "${NEW_COMMANDS}commands.push_back(new ${command_file});\n")
- list(APPEND SRCS ${command_file}.cxx)
- set_property(SOURCE ${command_file}.cxx PROPERTY HEADER_FILE_ONLY ON)
+ list(APPEND SRCS ${command_file}.cxx ${command_file}.h)
endforeach()
configure_file(cmCommands.cxx.in ${CMAKE_CURRENT_BINARY_DIR}/cmCommands.cxx @ONLY)