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 d84fb10034fc7371474c3d1413e78c317f743833 (commit)
via 95222584ee2a2ef7874c4eaf9cb20733fa347ad8 (commit)
via ce4eec97af00d14c9a57c0ac4e6762c0a4edf686 (commit)
via d0a328c9f67bb8e267bdeeb1cfa95da41bf7d6b6 (commit)
via 5c58a7e4d2eca9aa93518cc567e874fedcdf2a80 (commit)
via c29a1d58d9bc80eacfc39bf0fe274cf617444f2d (commit)
via dac7e8b833cd2e55e3d17edd9c26c3e06ce6bba1 (commit)
via 9636b03cca8b812fa2e33adf9b30ab5268b6eefb (commit)
from 6066aa471e28eb3d95b251d4d2a3bf83a31bba4f (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=d84fb10034fc7371474c3d1413e78c317f743833
commit d84fb10034fc7371474c3d1413e78c317f743833
Merge: 9522258 5c58a7e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 28 16:45:09 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 28 11:46:10 2019 -0500
Merge topic 'ppc64-toc-overflow'
5c58a7e4d2 ppc64: Work around TOC overflow with platform specific linker
flags
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3038
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95222584ee2a2ef7874c4eaf9cb20733fa347ad8
commit 95222584ee2a2ef7874c4eaf9cb20733fa347ad8
Merge: ce4eec9 c29a1d5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 28 16:44:40 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 28 11:45:17 2019 -0500
Merge topic 'doc-xref-EXPORT_NAME'
c29a1d58d9 Help: Link from install(TARGET) to EXPORT_NAME to rename
exported target
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3037
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce4eec97af00d14c9a57c0ac4e6762c0a4edf686
commit ce4eec97af00d14c9a57c0ac4e6762c0a4edf686
Merge: d0a328c dac7e8b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 28 16:44:29 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 28 11:44:35 2019 -0500
Merge topic 'doc-EXPORT_NAME'
dac7e8b833 Help: Link from EXPORT_NAME to relevant export commands
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3033
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0a328c9f67bb8e267bdeeb1cfa95da41bf7d6b6
commit d0a328c9f67bb8e267bdeeb1cfa95da41bf7d6b6
Merge: 6066aa4 9636b03
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 28 16:43:30 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Feb 28 11:43:39 2019 -0500
Merge topic 'refactor-handle-path-command'
9636b03cca cmFileCommand: Refactor HandleCMakePathCommand
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2960
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c58a7e4d2eca9aa93518cc567e874fedcdf2a80
commit 5c58a7e4d2eca9aa93518cc567e874fedcdf2a80
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Wed Feb 27 11:31:57 2019 -0600
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Wed Feb 27 13:00:00 2019 -0600
ppc64: Work around TOC overflow with platform specific linker flags
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5d0e144..c8a039a 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -44,6 +44,15 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
endif()
endif()
+# Workaround for TOC Overflow on ppc64
+if(CMAKE_SYSTEM_NAME STREQUAL "AIX" AND
+ CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bbigtoc")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+ CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-multi-toc")
+endif()
+
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND
NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c29a1d58d9bc80eacfc39bf0fe274cf617444f2d
commit c29a1d58d9bc80eacfc39bf0fe274cf617444f2d
Author: NeroBurner <pyro4h...@gmail.com>
AuthorDate: Wed Feb 27 11:35:02 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 27 11:53:02 2019 -0500
Help: Link from install(TARGET) to EXPORT_NAME to rename exported target
diff --git a/Help/command/install.rst b/Help/command/install.rst
index a0e8c37..8c98b65 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -272,6 +272,8 @@ top level:
This option associates the installed target files with an export called
``<export-name>``. It must appear before any target options. To actually
install the export file itself, call ``install(EXPORT)``, documented below.
+ See documentation of the :prop_tgt:`EXPORT_NAME` target property to change
+ the name of the exported target.
``INCLUDES DESTINATION``
This option specifies a list of directories which will be added to the
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dac7e8b833cd2e55e3d17edd9c26c3e06ce6bba1
commit dac7e8b833cd2e55e3d17edd9c26c3e06ce6bba1
Author: NeroBurner <pyro4h...@gmail.com>
AuthorDate: Wed Feb 27 11:16:46 2019 -0500
Commit: Reinhold Gschweicher <rgschweic...@riegl.com>
CommitDate: Wed Feb 27 17:44:00 2019 +0100
Help: Link from EXPORT_NAME to relevant export commands
diff --git a/Help/prop_tgt/EXPORT_NAME.rst b/Help/prop_tgt/EXPORT_NAME.rst
index 1b4247c..043c57a 100644
--- a/Help/prop_tgt/EXPORT_NAME.rst
+++ b/Help/prop_tgt/EXPORT_NAME.rst
@@ -3,6 +3,6 @@ EXPORT_NAME
Exported name for target files.
-This sets the name for the IMPORTED target generated when it this
-target is is exported. If not set, the logical target name is used by
-default.
+This sets the name for the IMPORTED target generated by the
+:command:`install(EXPORT)` and :command:`export` commands.
+If not set, the logical target name is used by default.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9636b03cca8b812fa2e33adf9b30ab5268b6eefb
commit 9636b03cca8b812fa2e33adf9b30ab5268b6eefb
Author: Artur Ryt <artur....@gmail.com>
AuthorDate: Tue Feb 26 21:25:00 2019 +0100
Commit: Artur Ryt <artur....@gmail.com>
CommitDate: Tue Feb 26 21:39:10 2019 +0100
cmFileCommand: Refactor HandleCMakePathCommand
Make use of cmJoin and fresh cmRange::transform
to reduce function complexity.
Move conversion logic to named functions.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 59ef48d..a2018c3 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2500,44 +2500,43 @@ bool
cmFileCommand::HandleRemove(std::vector<std::string> const& args,
return true;
}
+namespace {
+std::string ToNativePath(const std::string& path)
+{
+ const auto& outPath = cmSystemTools::ConvertToOutputPath(path);
+ if (outPath.size() > 1 && outPath.front() == '\"' &&
+ outPath.back() == '\"') {
+ return outPath.substr(1, outPath.size() - 2);
+ }
+ return outPath;
+}
+
+std::string ToCMakePath(const std::string& path)
+{
+ auto temp = path;
+ cmSystemTools::ConvertToUnixSlashes(temp);
+ return temp;
+}
+}
+
bool cmFileCommand::HandleCMakePathCommand(
std::vector<std::string> const& args, bool nativePath)
{
- std::vector<std::string>::const_iterator i = args.begin();
if (args.size() != 3) {
this->SetError("FILE([TO_CMAKE_PATH|TO_NATIVE_PATH] path result) must be "
"called with exactly three arguments.");
return false;
}
- i++; // Get rid of subcommand
#if defined(_WIN32) && !defined(__CYGWIN__)
char pathSep = ';';
#else
char pathSep = ':';
#endif
- std::vector<std::string> path = cmSystemTools::SplitString(*i, pathSep);
- i++;
- const char* var = i->c_str();
- std::string value;
- for (std::vector<std::string>::iterator j = path.begin(); j != path.end();
- ++j) {
- if (j != path.begin()) {
- value += ";";
- }
- if (!nativePath) {
- cmSystemTools::ConvertToUnixSlashes(*j);
- } else {
- *j = cmSystemTools::ConvertToOutputPath(*j);
- // remove double quotes in the path
- std::string& s = *j;
+ std::vector<std::string> path = cmSystemTools::SplitString(args[1], pathSep);
- if (s.size() > 1 && s.front() == '\"' && s.back() == '\"') {
- s = s.substr(1, s.size() - 2);
- }
- }
- value += *j;
- }
- this->Makefile->AddDefinition(var, value.c_str());
+ std::string value = cmJoin(
+ cmMakeRange(path).transform(nativePath ? ToNativePath : ToCMakePath), ";");
+ this->Makefile->AddDefinition(args[2], value.c_str());
return true;
}
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 9 +++++++++
Help/command/install.rst | 2 ++
Help/prop_tgt/EXPORT_NAME.rst | 6 +++---
Source/cmFileCommand.cxx | 47 +++++++++++++++++++++----------------------
4 files changed, 37 insertions(+), 27 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
