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, next has been updated
via 7e05f2022b860b00c67d7e2fb930c52fe52a9f3a (commit)
via 699a7255847ba8b348ba63a2244b5b57b328261c (commit)
from 2acfb25d43264514ae3712375b2543e57bf57414 (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=7e05f2022b860b00c67d7e2fb930c52fe52a9f3a
commit 7e05f2022b860b00c67d7e2fb930c52fe52a9f3a
Merge: 2acfb25 699a725
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 20 09:09:46 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 20 09:09:46 2011 -0500
Merge topic 'fix-try_compile-source-language-issue-11731' into next
699a725 Use shortest extension to verify try_compile language (#11731)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=699a7255847ba8b348ba63a2244b5b57b328261c
commit 699a7255847ba8b348ba63a2244b5b57b328261c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 20 09:02:57 2011 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 20 09:02:57 2011 -0500
Use shortest extension to verify try_compile language (#11731)
If the source-file form of try_compile is given a file name with
multiple '.' characters such as "a.b.c" use only the shortest extension
to check the language. This is the expected behavior and is consistent
with normal language extension determination in the method
cmSourceFileLocation::UpdateExtension.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 0ea6c5e..d636cb8 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -169,7 +169,7 @@ int
cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
}
std::string source = argv[2];
- std::string ext = cmSystemTools::GetFilenameExtension(source);
+ std::string ext = cmSystemTools::GetFilenameLastExtension(source);
const char* lang =(this->Makefile->GetCMakeInstance()->GetGlobalGenerator()
->GetLanguageFromExtension(ext.c_str()));
const char* def = this->Makefile->GetDefinition("CMAKE_MODULE_PATH");
-----------------------------------------------------------------------
Summary of changes:
Source/cmCoreTryCompile.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
