[Cmake-commits] CMake branch, master, updated. v3.13.2-817-gf5da1bb
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 f5da1bb34954b1a9e78f07133f4aa3ce332a329f (commit) from 5b7eb38e8e4711433ba83b22a6a74efd1c6e2de1 (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=f5da1bb34954b1a9e78f07133f4aa3ce332a329f commit f5da1bb34954b1a9e78f07133f4aa3ce332a329f Author: Kitware Robot AuthorDate: Tue Jan 8 00:01:05 2019 -0500 Commit: Kitware Robot CommitDate: Tue Jan 8 00:01:05 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 58df3d9..4bde35e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 13) -set(CMake_VERSION_PATCH 20190107) +set(CMake_VERSION_PATCH 20190108) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.13.2-816-g5b7eb38
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 5b7eb38e8e4711433ba83b22a6a74efd1c6e2de1 (commit)
via cbf0c0fce4dfe23912f7cc012c6f0234a5fd694b (commit)
via 1d32a35c10b384e8eb0dd2ce68c7bd11424409ac (commit)
via 67ac4ed1dc5ad049ab443ce76a3f93b207703cec (commit)
via 5257af363442aa4168776b70db1fc58d218a20c8 (commit)
from 6f904d01009bf26d129b2a2f0335e99bf30732ac (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=5b7eb38e8e4711433ba83b22a6a74efd1c6e2de1
commit 5b7eb38e8e4711433ba83b22a6a74efd1c6e2de1
Merge: 6f904d0 cbf0c0f
Author: Craig Scott
AuthorDate: Mon Jan 7 20:33:41 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 7 15:33:52 2019 -0500
Merge topic 'fix-warn-uninitialized-in-configure'
cbf0c0fce4 cmake: Enable --warn-uninitialized inside string(CONFIGURE) and
configure_file
1d32a35c10 cmCommandArgumentParserHelper: use
cmMakefile::MaybeWarnUninitialized
67ac4ed1dc cmMakefile: Move uninitialized vars logic into
MaybeWarnUninitialized()
5257af3634 cmMakefile: move common logic to IsProjectFile function
Acked-by: Kitware Robot
Merge-request: !2676
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbf0c0fce4dfe23912f7cc012c6f0234a5fd694b
commit cbf0c0fce4dfe23912f7cc012c6f0234a5fd694b
Author: Artur Ryt
AuthorDate: Thu Dec 13 20:45:17 2018 +0100
Commit: Craig Scott
CommitDate: Sun Dec 30 08:31:09 2018 +1100
cmake: Enable --warn-uninitialized inside string(CONFIGURE) and
configure_file
Fixes: #18489
diff --git a/Source/cmCommandArgumentParserHelper.cxx
b/Source/cmCommandArgumentParserHelper.cxx
index f94dc24..ca29967 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -92,9 +92,11 @@ const char*
cmCommandArgumentParserHelper::ExpandVariable(const char* var)
return this->AddString(ostr.str());
}
const char* value = this->Makefile->GetDefinition(var);
- if (!value && !this->RemoveEmpty) {
+ if (!value) {
this->Makefile->MaybeWarnUninitialized(var, this->FileName);
-return nullptr;
+if (!this->RemoveEmpty) {
+ return nullptr;
+}
}
if (this->EscapeQuotes && value) {
return this->AddString(cmSystemTools::EscapeQuotes(value));
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 256202c..68a5101 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2522,9 +2522,9 @@ const std::string& cmMakefile::ExpandVariablesInString(
// Suppress variable watches to avoid calling hooks twice. Suppress new
// dereferences since the OLD behavior is still what is actually used.
this->SuppressSideEffects = true;
- newError = ExpandVariablesInStringNew(
-newErrorstr, newResult, escapeQuotes, noEscapes, atOnly, filename,
-line, removeEmpty, replaceAt);
+ newError = ExpandVariablesInStringNew(newErrorstr, newResult,
+escapeQuotes, noEscapes, atOnly,
+filename, line, replaceAt);
this->SuppressSideEffects = false;
CM_FALLTHROUGH;
}
@@ -2537,9 +2537,9 @@ const std::string& cmMakefile::ExpandVariablesInString(
case cmPolicies::REQUIRED_ALWAYS:
// Messaging here would be *very* verbose.
case cmPolicies::NEW:
- mtype = ExpandVariablesInStringNew(errorstr, source, escapeQuotes,
- noEscapes, atOnly, filename, line,
- removeEmpty, replaceAt);
+ mtype =
+ExpandVariablesInStringNew(errorstr, source, escapeQuotes, noEscapes,
+ atOnly, filename, line, replaceAt);
break;
}
@@ -2726,7 +2726,7 @@ bool cmMakefile::IsProjectFile(const char* filename) const
cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
std::string& errorstr, std::string& source, bool escapeQuotes,
bool noEscapes, bool atOnly, const char* filename, long line,
- bool removeEmpty, bool replaceAt) const
+ bool replaceAt) const
{
// This method replaces ${VAR} and @VAR@ where VAR is looked up
// with GetDefinition(), if not found in the map, nothing is expanded.
@@ -2783,7 +2783,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
} else {
varresult = value;
}
- } else if (!removeEmpty && !this->SuppressSideEffects) {
+ } else if (!this->SuppressSideEffects) {
this->MaybeWarnUninitialized(lookup, filename);
}
Re: [CMake] Removing RPATH from existing binaries
On 2019 M01 5, Sat 08:06:31 CET Federico Milano wrote: > Hi. When packaging my application, I'm using install (FILES...) to copy > some third party executables to my binary folder. > > 1. I do not know if I'm doing it right or if I should use install > (PROGRAMS...) > 2. Some of the binaries have a RPATH, and I want to remove it. Is there any > CMake macro/function to do that, or should I call directly chrpath? if you look at the generated cmake_install.cmake scripts, you'll see the calls cmake uses to modify the RPATH when installing, I think it's some undocumented subfunction of the file() command. Alex -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.13.2-811-g6f904d0
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 6f904d01009bf26d129b2a2f0335e99bf30732ac (commit)
via 37c6a02dc27154881c8b6b03beb7a17528ed5907 (commit)
via 7583f7490e23e025d9072533990f7cd9fec4b61d (commit)
from c1e9b1c283caccd468adfafd0496edd63964b899 (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=6f904d01009bf26d129b2a2f0335e99bf30732ac
commit 6f904d01009bf26d129b2a2f0335e99bf30732ac
Merge: c1e9b1c 37c6a02
Author: Craig Scott
AuthorDate: Mon Jan 7 20:26:44 2019 +
Commit: Kitware Robot
CommitDate: Mon Jan 7 15:26:55 2019 -0500
Merge topic 'nmake-compile-commands'
37c6a02dc2 CMake: fix nmake compile_commands generation
7583f7490e cmGlobalGenerator: Teach EscapeJSON to escape newlines and tabs
Acked-by: Kitware Robot
Merge-request: !2648
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c6a02dc27154881c8b6b03beb7a17528ed5907
commit 37c6a02dc27154881c8b6b03beb7a17528ed5907
Author: Yan Pashkovsky
AuthorDate: Fri Dec 14 18:23:53 2018 +0300
Commit: Yan Pashkovsky
CommitDate: Fri Dec 14 18:23:53 2018 +0300
CMake: fix nmake compile_commands generation
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 9acae49..0ea9724 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -687,6 +687,17 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
std::string langIncludes = std::string("$(") + lang + "_INCLUDES)";
compileCommand.replace(compileCommand.find(langIncludes),
langIncludes.size(), this->GetIncludes(lang));
+
+ const char* eliminate[] = {
+this->Makefile->GetDefinition("CMAKE_START_TEMP_FILE"),
+this->Makefile->GetDefinition("CMAKE_END_TEMP_FILE")
+ };
+ for (const char* el : eliminate) {
+if (el) {
+ cmSystemTools::ReplaceString(compileCommand, el, "");
+}
+ }
+
this->GlobalGenerator->AddCXXCompileCommand(
source.GetFullPath(), workingDirectory, compileCommand);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7583f7490e23e025d9072533990f7cd9fec4b61d
commit 7583f7490e23e025d9072533990f7cd9fec4b61d
Author: Yan Pashkovsky
AuthorDate: Fri Dec 14 18:23:20 2018 +0300
Commit: Yan Pashkovsky
CommitDate: Fri Dec 14 18:23:20 2018 +0300
cmGlobalGenerator: Teach EscapeJSON to escape newlines and tabs
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2805395..9326e5f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3014,11 +3014,23 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget*
target)
std::string cmGlobalGenerator::EscapeJSON(const std::string& s)
{
std::string result;
+ result.reserve(s.size());
for (char i : s) {
-if (i == '"' || i == '\\') {
- result += '\\';
+switch (i) {
+ case '"':
+ case '\\':
+result += '\\';
+result += i;
+break;
+ case '\n':
+result += "\\n";
+break;
+ case '\t':
+result += "\\t";
+break;
+ default:
+result += i;
}
-result += i;
}
return result;
}
---
Summary of changes:
Source/cmGlobalGenerator.cxx | 18 +++---
Source/cmMakefileTargetGenerator.cxx | 11 +++
2 files changed, 26 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[CMake] Feature Request
Would it be possible to allow the include command to use a variable containing content instead of a variable containing a file or module that has content? Or possibly a separate command? The creation of temporary files to do so makes things annoyingly cluttered. Tony -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake
[CMake] Ninja generator RSP handling on Windows
Hello, We have a cross-compilation toolchain we're using on Windows with Ninja (and Visual Studio) that is primarily built upon Clang, however our "-ar" tool is built expecting RSP files with line break delimiters. We notice that the Ninja generator explicitly switches to the space based RSP format when built _WIN32 and the compiler id is GNU or Clang and not simulating MSVC. Currently as a workaround, our toolchain file is setting the ar to a script that modifies RSP files given on the command line and then passes things along to the actual tool, but we're wondering if there's a better way. Thanks, Stephan -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake
