[Cmake-commits] CMake branch, master, updated. v2.8.12-502-g16df245
Brad King
brad.king at kitware.com
Mon Oct 28 08:39:41 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 16df2456a440d87fb3e8e53fb59a2817b288b9af (commit)
via 3e04946f7b69418f6b222875ad18fed3438e0fa1 (commit)
via 6007f7ca01b84ee70ffe49ae5a8bb41763116024 (commit)
via 332771c942c25c0e60de136091fe77ac761e1965 (commit)
from ecc6d7f9190a660c0f442c4d03854b06e3fc7856 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16df2456a440d87fb3e8e53fb59a2817b288b9af
commit 16df2456a440d87fb3e8e53fb59a2817b288b9af
Merge: ecc6d7f 3e04946
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 08:39:29 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 28 08:39:29 2013 -0400
Merge topic 'enable-language-require-compiler'
3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path
6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE
332771c CMakeDetermine*Compiler: Remove temporary cache entry
diff --cc Source/cmGlobalGenerator.cxx
index e26f59f,0461001..5b0df2c
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@@ -622,8 -661,35 +661,12 @@@ cmGlobalGenerator::EnableLanguage(std::
// next time cmake is run
if(!mf->IsOn(compilerWorks.c_str()))
{
+ std::string compilerLangFile = rootBin;
+ compilerLangFile += "/CMake";
+ compilerLangFile += lang;
+ compilerLangFile += "Compiler.cmake";
cmSystemTools::RemoveFile(compilerLangFile.c_str());
}
- else
- {
- // load backwards compatibility stuff for C and CXX
- // for old versions of CMake ListFiles C and CXX had some
- // backwards compatibility files they have to load
- // These files have a bunch of try compiles in them so
- // should only be done
- if (mf->NeedBackwardsCompatibility(1,4))
- {
- if(strcmp(lang, "C") == 0)
- {
- ifpath =
- mf->GetModulesFile("CMakeBackwardCompatibilityC.cmake");
- mf->ReadListFile(0,ifpath.c_str());
- }
- if(strcmp(lang, "CXX") == 0)
- {
- ifpath =
- mf->GetModulesFile("CMakeBackwardCompatibilityCXX.cmake");
- mf->ReadListFile(0,ifpath.c_str());
- }
- }
- }
} // end if in try compile
} // end need test language
// Store the shared library flags so that we can satisfy CMP0018
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompilerId.c.in | 1 +
Modules/CMakeCXXCompilerId.cpp.in | 1 +
Modules/CMakeDetermineASMCompiler.cmake | 2 +-
Modules/CMakeDetermineCCompiler.cmake | 2 +-
Modules/CMakeDetermineCXXCompiler.cmake | 2 +-
Modules/CMakeDetermineCompilerId.cmake | 10 +-
Modules/CMakeDetermineFortranCompiler.cmake | 2 +-
Source/cmGlobalGenerator.cxx | 120 ++++++++++++++++----
Source/cmGlobalGenerator.h | 2 +
Source/cmGlobalVisualStudioGenerator.h | 1 +
Source/cmGlobalXCodeGenerator.h | 1 +
Tests/RunCMake/CMakeLists.txt | 1 +
.../CompilerChange/EmptyCompiler-override.cmake | 2 +
.../CompilerChange/EmptyCompiler-stderr.txt | 12 ++-
Tests/RunCMake/CompilerChange/EmptyCompiler.cmake | 3 +-
.../BadCompilerC-result.txt} | 0
.../CompilerNotFound/BadCompilerC-stderr.txt | 12 ++
Tests/RunCMake/CompilerNotFound/BadCompilerC.cmake | 3 +
.../BadCompilerCXX-result.txt} | 0
.../CompilerNotFound/BadCompilerCXX-stderr.txt | 12 ++
.../RunCMake/CompilerNotFound/BadCompilerCXX.cmake | 3 +
.../BadCompilerCandCXX-result.txt} | 0
.../CompilerNotFound/BadCompilerCandCXX-stderr.txt | 25 ++++
.../CompilerNotFound/BadCompilerCandCXX.cmake | 4 +
.../{CMP0004 => CompilerNotFound}/CMakeLists.txt | 0
.../NoCompilerC-IDE-result.txt} | 0
.../CompilerNotFound/NoCompilerC-IDE-stderr.txt | 5 +
.../CompilerNotFound/NoCompilerC-IDE.cmake | 3 +
.../NoCompilerCXX-IDE-result.txt} | 0
.../CompilerNotFound/NoCompilerCXX-IDE-stderr.txt | 5 +
.../CompilerNotFound/NoCompilerCXX-IDE.cmake | 3 +
.../NoCompilerCandCXX-IDE-result.txt} | 0
.../NoCompilerCandCXX-IDE-stderr.txt | 11 ++
.../CompilerNotFound/NoCompilerCandCXX-IDE.cmake | 4 +
Tests/RunCMake/CompilerNotFound/RunCMakeTest.cmake | 11 ++
35 files changed, 224 insertions(+), 39 deletions(-)
create mode 100644 Tests/RunCMake/CompilerChange/EmptyCompiler-override.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/BadCompilerC-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerC-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerC.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/BadCompilerCXX-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCXX-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCXX.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/BadCompilerCandCXX-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCandCXX-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCandCXX.cmake
copy Tests/RunCMake/{CMP0004 => CompilerNotFound}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/NoCompilerC-IDE-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerC-IDE-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerC-IDE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/NoCompilerCXX-IDE-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerCXX-IDE-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerCXX-IDE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompilerNotFound/NoCompilerCandCXX-IDE-result.txt} (100%)
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerCandCXX-IDE-stderr.txt
create mode 100644 Tests/RunCMake/CompilerNotFound/NoCompilerCandCXX-IDE.cmake
create mode 100644 Tests/RunCMake/CompilerNotFound/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list