diff options
| author | Brad King <brad.king@kitware.com> | 2008-02-14 16:58:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-02-14 16:58:32 (GMT) |
| commit | 5b02a4a864d2e68c683be6275709ce3e38d51fee (patch) | |
| tree | 70b57c336d56db5afe08acfb7ab0ed4aa84c5b1b /Source/cmBootstrapCommands.cxx | |
| parent | 8375bb4768f29f595c66140b77dd6b01713afb79 (diff) | |
| download | CMake-5b02a4a864d2e68c683be6275709ce3e38d51fee.zip CMake-5b02a4a864d2e68c683be6275709ce3e38d51fee.tar.gz CMake-5b02a4a864d2e68c683be6275709ce3e38d51fee.tar.bz2 | |
ENH: Re-enable diagnosis of non-unique target names.
- Re-enable enforcement in cmMakefile::EnforceUniqueName
- Improve error message to help user resolve the problem
- Fix Modules/CTestTargets.cmake to not duplicate testing targets
- Move commands used by the changes to Modules/CTestTargets.cmake
to build during bootstrap: DEFINE_PROPERTY, GET_PROPERTY
Diffstat (limited to 'Source/cmBootstrapCommands.cxx')
| -rw-r--r-- | Source/cmBootstrapCommands.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx index 197ee2b..af9bf3d 100644 --- a/Source/cmBootstrapCommands.cxx +++ b/Source/cmBootstrapCommands.cxx @@ -34,6 +34,7 @@ #include "cmConfigureFileCommand.cxx" #include "cmCoreTryCompile.cxx" #include "cmCreateTestSourceList.cxx" +#include "cmDefinePropertyCommand.cxx" #include "cmElseCommand.cxx" #include "cmEnableTestingCommand.cxx" #include "cmEndForEachCommand.cxx" @@ -56,6 +57,7 @@ #include "cmGetCMakePropertyCommand.cxx" #include "cmGetDirectoryPropertyCommand.cxx" #include "cmGetFilenameComponentCommand.cxx" +#include "cmGetPropertyCommand.cxx" #include "cmGetSourceFilePropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx" #include "cmHexFileConverter.cxx" @@ -103,6 +105,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands) commands.push_back(new cmCMakeMinimumRequired); commands.push_back(new cmConfigureFileCommand); commands.push_back(new cmCreateTestSourceList); + commands.push_back(new cmDefinePropertyCommand); commands.push_back(new cmElseCommand); commands.push_back(new cmEnableTestingCommand); commands.push_back(new cmEndForEachCommand); @@ -122,6 +125,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands) commands.push_back(new cmGetCMakePropertyCommand); commands.push_back(new cmGetDirectoryPropertyCommand); commands.push_back(new cmGetFilenameComponentCommand); + commands.push_back(new cmGetPropertyCommand); commands.push_back(new cmGetSourceFilePropertyCommand); commands.push_back(new cmGetTargetPropertyCommand); commands.push_back(new cmIfCommand); |