testing more agressive compatability settings
This commit is contained in:
parent
a086d08311
commit
dcc9c131b4
|
@ -20,12 +20,16 @@
|
||||||
bool cmSourceFilesCommand::InitialPass(std::vector<std::string> const& args)
|
bool cmSourceFilesCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
{
|
{
|
||||||
const char* versionValue
|
const char* versionValue
|
||||||
= m_Makefile->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
|
= m_Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
|
||||||
if (versionValue && atof(versionValue) > 1.2)
|
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;
|
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 )
|
if(args.size() < 1 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -1037,9 +1037,6 @@ int cmake::LoadCache()
|
||||||
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
|
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
|
||||||
"For backwards compatibility, what version of CMake commands and syntax should this version of CMake allow.",
|
"For backwards compatibility, what version of CMake commands and syntax should this version of CMake allow.",
|
||||||
cmCacheManager::STRING);
|
cmCacheManager::STRING);
|
||||||
cmCacheManager::CacheIterator it =
|
|
||||||
this->m_CacheManager->GetCacheIterator("CMAKE_BACKWARDS_COMPATIBILITY");
|
|
||||||
it.SetProperty("ADVANCED", "1");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue