diff options
| -rw-r--r-- | Source/cmBootstrapCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCommands.cxx | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx index bdc9e3b..b8031fc 100644 --- a/Source/cmBootstrapCommands.cxx +++ b/Source/cmBootstrapCommands.cxx @@ -86,6 +86,7 @@ #include "cmSetSourceFilesPropertiesCommand.cxx" #include "cmSetTargetPropertiesCommand.cxx" #include "cmSetTestsPropertiesCommand.cxx" +#include "cmGetTestPropertyCommand.cxx" #include "cmSiteNameCommand.cxx" #include "cmStringCommand.cxx" #include "cmSubdirCommand.cxx" @@ -154,6 +155,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands) commands.push_back(new cmSetPropertyCommand); commands.push_back(new cmSetSourceFilesPropertiesCommand); commands.push_back(new cmSetTargetPropertiesCommand); + commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmSetTestsPropertiesCommand); commands.push_back(new cmSiteNameCommand); commands.push_back(new cmStringCommand); diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index d719d55..d9a9855 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -24,7 +24,6 @@ #include "cmExportCommand.cxx" #include "cmExportLibraryDependencies.cxx" #include "cmFLTKWrapUICommand.cxx" -#include "cmGetTestPropertyCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx" #include "cmInstallProgramsCommand.cxx" #include "cmLinkLibrariesCommand.cxx" @@ -66,7 +65,6 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands.push_back(new cmExportCommand); commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmFLTKWrapUICommand); - commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmIncludeExternalMSProjectCommand); commands.push_back(new cmInstallProgramsCommand); commands.push_back(new cmLinkLibrariesCommand); diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 472e2b3..f2601c8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -12,16 +12,6 @@ MACRO(ADD_TEST_MACRO NAME COMMAND) --test-command ${COMMAND}) ENDMACRO(ADD_TEST_MACRO) -# Support bootstrap builds. When CMake 2.6 is required we can switch -# to using the get_property command which is in bootstrap. Note that -# that command will return empty instead of NOTFOUND if the property -# is not set. -IF(NOT COMMAND GET_TEST_PROPERTY) - MACRO(GET_TEST_PROPERTY test prop var) - SET(${var} "") - ENDMACRO(GET_TEST_PROPERTY) -ENDIF(NOT COMMAND GET_TEST_PROPERTY) - # Testing IF(BUILD_TESTING) # Should the long tests be run? |