diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-30 11:06:15 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-30 11:06:15 -0400 |
| commit | a4c47fe0c7d518e180aef3d130c4d57e105d94ba (patch) | |
| tree | ff3d205b50d6e9d7a0ecd4e3e5889c86b5763eb1 /Source/cmGlobalGenerator.cxx | |
| parent | 3e72df14845fff7830701a9fd8d587968ad43d4a (diff) | |
| parent | e5fee8a7c2873531c8e8e8ee991e8d0697f9bf73 (diff) | |
| download | cmake-a4c47fe0c7d518e180aef3d130c4d57e105d94ba.tar.gz | |
Merge topic 'cmake-platform-info-version'
e5fee8a Store ABI detection results in compiler information files
3df81b4 Move CMAKE_<LANG>_COMPILER_WORKS to compiler information files
7195aca Make platform information files specific to the CMake version
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 52b451cd06..578fa9ec97 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -315,9 +315,11 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, { rootBin = this->ConfiguredFilesPath; } + rootBin += "/"; + rootBin += cmVersion::GetCMakeVersion(); // set the dir for parent files so they can be used by modules - mf->AddDefinition("CMAKE_PLATFORM_ROOT_BIN",rootBin.c_str()); + mf->AddDefinition("CMAKE_PLATFORM_INFO_DIR",rootBin.c_str()); // find and make sure CMAKE_MAKE_PROGRAM is defined this->FindMakeProgram(mf); @@ -386,14 +388,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, // If the existing build tree was already configured with this // version of CMake then try to load the configured file first // to avoid duplicate compiler tests. - unsigned int cacheMajor = mf->GetCacheMajorVersion(); - unsigned int cacheMinor = mf->GetCacheMinorVersion(); - unsigned int selfMajor = cmVersion::GetMajorVersion(); - unsigned int selfMinor = cmVersion::GetMinorVersion(); - if((this->CMakeInstance->GetIsInTryCompile() || - (cacheMajor == 0 && cacheMinor == 0) || - (selfMajor == cacheMajor && selfMinor == cacheMinor)) && - cmSystemTools::FileExists(fpath.c_str())) + if(cmSystemTools::FileExists(fpath.c_str())) { if(!mf->ReadListFile(0,fpath.c_str())) { |