Commit 53e0ed32 authored by Brad King's avatar Brad King
Browse files

BUG: Fix crash when CMAKE_BACKWARDS_COMPATIBILITY is not set.

parent cd4d2acb
...@@ -464,9 +464,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, ...@@ -464,9 +464,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
// backwards compatibility files they have to load // backwards compatibility files they have to load
// These files have a bunch of try compiles in them so // These files have a bunch of try compiles in them so
// should only be done // should only be done
const char* versionValue if (mf->NeedBackwardsCompatibility(1,4))
= mf->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
if (atof(versionValue) <= 1.4)
{ {
if(strcmp(lang, "C") == 0) if(strcmp(lang, "C") == 0)
{ {
......
...@@ -50,11 +50,9 @@ bool cmIncludeDirectoryCommand ...@@ -50,11 +50,9 @@ bool cmIncludeDirectoryCommand
} }
if(i->size() == 0) if(i->size() == 0)
{ {
const char* versionValue =
this->Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
const char* errorMessage const char* errorMessage
= "Empty Include Directory Passed into INCLUDE_DIRECTORIES command."; = "Empty Include Directory Passed into INCLUDE_DIRECTORIES command.";
if(atof(versionValue) < 2.5) if(this->Makefile->NeedBackwardsCompatibility(2,4))
{ {
cmSystemTools::Error(errorMessage); cmSystemTools::Error(errorMessage);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment