diff options
| -rw-r--r-- | Source/cmSourceFilesCommand.cxx | 10 | ||||
| -rw-r--r-- | Source/cmake.cxx | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmSourceFilesCommand.cxx b/Source/cmSourceFilesCommand.cxx index fc1171c..a2d2ada 100644 --- a/Source/cmSourceFilesCommand.cxx +++ b/Source/cmSourceFilesCommand.cxx @@ -20,12 +20,16 @@ bool cmSourceFilesCommand::InitialPass(std::vector<std::string> const& args) { const char* versionValue - = m_Makefile->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION"); - if (versionValue && atof(versionValue) > 1.2) + = m_Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY"); + if (atof(versionValue) > 1.4) { - this->SetError("The SOURCE_FILES command has been deprecated in CMake version 1.4. You should use the SET command instead.\n"); + this->SetError("The SOURCE_FILES command was deprecated in CMake version 1.4 and will be removed in later versions of CMake. You should modify your CMakeLists.txt files to use the SET command instead, or set the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.2 or less.\n"); return false; } + if (atof(versionValue) > 1.2) + { + cmSystemTools::Message("The SOURCE_FILES command was deprecated in CMake version 1.4 and will be removed in later versions. You should modify your CMakeLists.txt files to use the SET command instead, or set the cache value of CMAKE_BACKWARDS_COMPATIBILITY to 1.2 or less.\n","Warning"); + } if(args.size() < 1 ) { diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b23ff9d..5a4fa1f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1037,9 +1037,6 @@ int cmake::LoadCache() ("CMAKE_BACKWARDS_COMPATIBILITY",ver, "For backwards compatibility, what version of CMake commands and syntax should this version of CMake allow.", cmCacheManager::STRING); - cmCacheManager::CacheIterator it = - this->m_CacheManager->GetCacheIterator("CMAKE_BACKWARDS_COMPATIBILITY"); - it.SetProperty("ADVANCED", "1"); } return 0; |