kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add get_test_property to bootstrap so bootstrap builds test the same as non-bootstrap builds

Browse Source
This commit is contained in:
Bill Hoffman 2008-07-07 15:07:54 -04:00
parent 9a3c0bf073
commit 2081dcbfce
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmBootstrapCommands.cxx
View File

@ -86,6 +86,7 @@
#include "cmSetSourceFilesPropertiesCommand.cxx" #include "cmSetSourceFilesPropertiesCommand.cxx"
#include "cmSetTargetPropertiesCommand.cxx" #include "cmSetTargetPropertiesCommand.cxx"
#include "cmSetTestsPropertiesCommand.cxx" #include "cmSetTestsPropertiesCommand.cxx"
#include "cmGetTestPropertyCommand.cxx"
#include "cmSiteNameCommand.cxx" #include "cmSiteNameCommand.cxx"
#include "cmStringCommand.cxx" #include "cmStringCommand.cxx"
#include "cmSubdirCommand.cxx" #include "cmSubdirCommand.cxx"
@ -154,6 +155,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmSetPropertyCommand); commands.push_back(new cmSetPropertyCommand);
commands.push_back(new cmSetSourceFilesPropertiesCommand); commands.push_back(new cmSetSourceFilesPropertiesCommand);
commands.push_back(new cmSetTargetPropertiesCommand); commands.push_back(new cmSetTargetPropertiesCommand);
commands.push_back(new cmGetTestPropertyCommand);
commands.push_back(new cmSetTestsPropertiesCommand); commands.push_back(new cmSetTestsPropertiesCommand);
commands.push_back(new cmSiteNameCommand); commands.push_back(new cmSiteNameCommand);
commands.push_back(new cmStringCommand); commands.push_back(new cmStringCommand);

2
Source/cmCommands.cxx
View File

@ -24,7 +24,6 @@
#include "cmExportCommand.cxx" #include "cmExportCommand.cxx"
#include "cmExportLibraryDependencies.cxx" #include "cmExportLibraryDependencies.cxx"
#include "cmFLTKWrapUICommand.cxx" #include "cmFLTKWrapUICommand.cxx"
#include "cmGetTestPropertyCommand.cxx"
#include "cmIncludeExternalMSProjectCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx"
#include "cmInstallProgramsCommand.cxx" #include "cmInstallProgramsCommand.cxx"
#include "cmLinkLibrariesCommand.cxx" #include "cmLinkLibrariesCommand.cxx"
@ -66,7 +65,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmExportCommand); commands.push_back(new cmExportCommand);
commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmExportLibraryDependenciesCommand);
commands.push_back(new cmFLTKWrapUICommand); commands.push_back(new cmFLTKWrapUICommand);
commands.push_back(new cmGetTestPropertyCommand);
commands.push_back(new cmIncludeExternalMSProjectCommand); commands.push_back(new cmIncludeExternalMSProjectCommand);
commands.push_back(new cmInstallProgramsCommand); commands.push_back(new cmInstallProgramsCommand);
commands.push_back(new cmLinkLibrariesCommand); commands.push_back(new cmLinkLibrariesCommand);

10
Tests/CMakeLists.txt
View File

@ -12,16 +12,6 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
--test-command ${COMMAND}) --test-command ${COMMAND})
ENDMACRO(ADD_TEST_MACRO) 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 # Testing
IF(BUILD_TESTING) IF(BUILD_TESTING)
# Should the long tests be run? # Should the long tests be run?