[Cmake-commits] CMake branch, master, updated. v3.10.2-880-g9c52b58
Kitware Robot
kwrobot at kitware.com
Tue Jan 23 09:45:05 EST 2018
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 9c52b587b6dfa54266bcebbe7e111d7dde437a75 (commit)
via ce863c17d08e6631c4a194fc3f9fb3f63ea65d11 (commit)
via 5cbf3653ff25a42577e9473b447a4b9afb128875 (commit)
via 51caac6958c9adb31dae4c2a61bd0bfce9e45a23 (commit)
from 2c6f5baaa7e101cdd3e5769a3fd8d49d0501b8e6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c52b587b6dfa54266bcebbe7e111d7dde437a75
commit 9c52b587b6dfa54266bcebbe7e111d7dde437a75
Merge: ce863c1 5cbf365
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 23 14:35:46 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 23 09:36:09 2018 -0500
Merge topic 'recognize-versioned-shared-libraries'
5cbf3653 cmComputeLinkInformation: Better RPATH detection for versioned libraries.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1682
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce863c17d08e6631c4a194fc3f9fb3f63ea65d11
commit ce863c17d08e6631c4a194fc3f9fb3f63ea65d11
Merge: 2c6f5ba 51caac6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 23 14:35:38 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 23 09:35:43 2018 -0500
Merge topic 'feature-codelite-fortran'
51caac69 CodeLite: Better support for Fortran and Windows
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1678
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cbf3653ff25a42577e9473b447a4b9afb128875
commit 5cbf3653ff25a42577e9473b447a4b9afb128875
Author: Byoungchan Lee <byoungchan.lee at gmx.com>
AuthorDate: Tue Jan 23 01:22:15 2018 +0900
Commit: Byoungchan Lee <byoungchan.lee at gmx.com>
CommitDate: Tue Jan 23 01:22:15 2018 +0900
cmComputeLinkInformation: Better RPATH detection for versioned libraries.
Some libraries uses the non-conventional SONAME scheme like
`libssl.so.1.1` or `libboost_system.so.1.64.0`, but CMake didn't count on
such versioned libraries. This commit modify regular expressions to match
relaxed format of shared library name for determining various linker options,
especially `RPATH`.
Note that support for one component has been available since v2.8.12.
Fixes: #15938
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index fb13a58..18cca5a 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -913,11 +913,9 @@ std::string cmComputeLinkInformation::CreateExtensionRegex(
// Finish the list.
libext += ")";
- // Add an optional OpenBSD version component.
- if (this->OpenBSD) {
- libext += "(\\.[0-9]+\\.[0-9]+)?";
- } else if (type == LinkShared) {
- libext += "(\\.[0-9]+)?";
+ // Add an optional OpenBSD-style version or major.minor.version component.
+ if (this->OpenBSD || type == LinkShared) {
+ libext += "(\\.[0-9]+)*";
}
libext += "$";
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51caac6958c9adb31dae4c2a61bd0bfce9e45a23
commit 51caac6958c9adb31dae4c2a61bd0bfce9e45a23
Author: Tobias R. Henle <tobias at page23.de>
AuthorDate: Fri Jan 19 22:41:54 2018 +0100
Commit: Tobias R. Henle <tobias at page23.de>
CommitDate: Fri Jan 19 22:41:54 2018 +0100
CodeLite: Better support for Fortran and Windows
Fortran source files are added to the src folder of CodeLite projects and
the "Compile Single File" command uses "$(CurrentFileFullName)"
instead of "$(CurrentFileName)" with the correct filename extension
for object files on windows now.
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 4958007..fad0723 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -198,8 +198,6 @@ std::string cmExtraCodeLiteGenerator::CollectSourceFiles(
std::map<std::string, cmSourceFile*>& cFiles,
std::set<std::string>& otherFiles)
{
- auto cm = this->GlobalGenerator->GetCMakeInstance();
-
std::string projectType;
switch (gt->GetType()) {
case cmStateEnums::EXECUTABLE: {
@@ -227,19 +225,18 @@ std::string cmExtraCodeLiteGenerator::CollectSourceFiles(
gt->GetSourceFiles(sources,
makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
for (cmSourceFile* s : sources) {
- // check whether it is a C/C++/CUDA implementation file
- bool isCFile = false;
- std::string lang = s->GetLanguage();
- if (lang == "C" || lang == "CXX" || lang == "CUDA") {
- std::string const& srcext = s->GetExtension();
- isCFile = cm->IsSourceExtension(srcext);
- }
-
+ // check whether it is a source or a include file
// then put it accordingly into one of the two containers
- if (isCFile) {
- cFiles[s->GetFullPath()] = s;
- } else {
- otherFiles.insert(s->GetFullPath());
+ switch (cmSystemTools::GetFileFormat(s->GetExtension().c_str())) {
+ case cmSystemTools::C_FILE_FORMAT:
+ case cmSystemTools::CXX_FILE_FORMAT:
+ case cmSystemTools::CUDA_FILE_FORMAT:
+ case cmSystemTools::FORTRAN_FILE_FORMAT: {
+ cFiles[s->GetFullPath()] = s;
+ } break;
+ default: {
+ otherFiles.insert(s->GetFullPath());
+ }
}
}
}
@@ -679,7 +676,11 @@ std::string cmExtraCodeLiteGenerator::GetSingleFileBuildCommand(
std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
if (generator == "Unix Makefiles" || generator == "MinGW Makefiles") {
std::ostringstream ss;
- ss << make << " -f$(ProjectPath)/Makefile $(CurrentFileName).cpp.o";
+#if defined(_WIN32)
+ ss << make << " -f$(ProjectPath)/Makefile -B $(CurrentFileFullName).obj";
+#else
+ ss << make << " -f$(ProjectPath)/Makefile -B $(CurrentFileFullName).o";
+#endif
buildCommand = ss.str();
}
return buildCommand;
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 8 +++-----
Source/cmExtraCodeLiteGenerator.cxx | 31 ++++++++++++++++---------------
2 files changed, 19 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list