[Cmake-commits] CMake branch, master, updated. v3.12.2-645-g2af106a
Kitware Robot
kwrobot at kitware.com
Mon Sep 17 09:35:04 EDT 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 2af106a43a259533b0cec262ca368f577c3925b0 (commit)
via 7bf9796f3d0170f35c674635c9a274b982ba5436 (commit)
via 6da8b67c3f9c07352fa36e717e79e15ef36495f3 (commit)
via e3f9ea8616966b4f71e75a7ce8484ab6e398eb25 (commit)
from a6ae99ebbe01350f46d8540cc8b792bc6c1cc3d6 (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=2af106a43a259533b0cec262ca368f577c3925b0
commit 2af106a43a259533b0cec262ca368f577c3925b0
Merge: 7bf9796 6da8b67
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 17 13:25:24 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 17 09:25:40 2018 -0400
Merge topic 'link-options'
6da8b67c3f target_link_options: fix erroneous handling of BEFORE keyword.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2384
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bf9796f3d0170f35c674635c9a274b982ba5436
commit 7bf9796f3d0170f35c674635c9a274b982ba5436
Merge: a6ae99e e3f9ea8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 17 13:24:55 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 17 09:25:03 2018 -0400
Merge topic 'docs/gen-see-also'
e3f9ea8616 docs: add some 'see also' helper texts
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2381
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6da8b67c3f9c07352fa36e717e79e15ef36495f3
commit 6da8b67c3f9c07352fa36e717e79e15ef36495f3
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Fri Sep 14 18:10:58 2018 +0200
Commit: Marc Chevrier <marc.chevrier at gmail.com>
CommitDate: Fri Sep 14 18:10:58 2018 +0200
target_link_options: fix erroneous handling of BEFORE keyword.
diff --git a/Source/cmTargetLinkOptionsCommand.cxx b/Source/cmTargetLinkOptionsCommand.cxx
index f0f13fd..d6ed5ae 100644
--- a/Source/cmTargetLinkOptionsCommand.cxx
+++ b/Source/cmTargetLinkOptionsCommand.cxx
@@ -33,9 +33,9 @@ std::string cmTargetLinkOptionsCommand::Join(
}
bool cmTargetLinkOptionsCommand::HandleDirectContent(
- cmTarget* tgt, const std::vector<std::string>& content, bool, bool)
+ cmTarget* tgt, const std::vector<std::string>& content, bool prepend, bool)
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
- tgt->InsertLinkOption(this->Join(content), lfbt);
+ tgt->InsertLinkOption(this->Join(content), lfbt, prepend);
return true; // Successfully handled.
}
diff --git a/Tests/CMakeCommands/target_link_options/CMakeLists.txt b/Tests/CMakeCommands/target_link_options/CMakeLists.txt
index 3bb6ff3..e84d041 100644
--- a/Tests/CMakeCommands/target_link_options/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_options/CMakeLists.txt
@@ -24,3 +24,11 @@ get_target_property(result target_link_options_3 INTERFACE_LINK_OPTIONS)
if (NOT result MATCHES "-INTERFACE_FLAG")
message(SEND_ERROR "target_link_options not populated the INTERFACE_LINK_OPTIONS target property of static library")
endif()
+
+add_library(target_link_options_4 SHARED EXCLUDE_FROM_ALL LinkOptionsLib.c)
+target_link_options(target_link_options_4 PRIVATE -PRIVATE_FLAG)
+target_link_options(target_link_options_4 BEFORE PRIVATE -BEFORE_PRIVATE_FLAG)
+get_target_property(result target_link_options_4 LINK_OPTIONS)
+if (NOT result MATCHES "-BEFORE_PRIVATE_FLAG.*-PRIVATE_FLAG")
+ message(SEND_ERROR "target_link_options not managing correctly 'BEFORE' keyword")
+endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3f9ea8616966b4f71e75a7ce8484ab6e398eb25
commit e3f9ea8616966b4f71e75a7ce8484ab6e398eb25
Author: Brian Heim <brianlheim at gmail.com>
AuthorDate: Thu Sep 13 00:32:01 2018 -0500
Commit: Brian Heim <brianlheim at gmail.com>
CommitDate: Thu Sep 13 00:32:01 2018 -0500
docs: add some 'see also' helper texts
in cmake-generator-expressions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index c3428d1..76fd3d9 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -68,10 +68,13 @@ Available logical expressions are:
target.
``$<PLATFORM_ID:comp>``
``1`` if the CMake-id of the platform matches ``comp``, otherwise ``0``.
+ See also the :variable:`CMAKE_SYSTEM_NAME` variable.
``$<C_COMPILER_ID:comp>``
``1`` if the CMake-id of the C compiler matches ``comp``, otherwise ``0``.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
``$<CXX_COMPILER_ID:comp>``
``1`` if the CMake-id of the CXX compiler matches ``comp``, otherwise ``0``.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_ID` variable.
``$<VERSION_LESS:v1,v2>``
``1`` if ``v1`` is a version less than ``v2``, else ``0``.
``$<VERSION_GREATER:v1,v2>``
@@ -84,8 +87,10 @@ Available logical expressions are:
``1`` if ``v1`` is a version greater than or equal to ``v2``, else ``0``.
``$<C_COMPILER_VERSION:ver>``
``1`` if the version of the C compiler matches ``ver``, otherwise ``0``.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
``$<CXX_COMPILER_VERSION:ver>``
``1`` if the version of the CXX compiler matches ``ver``, otherwise ``0``.
+ See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable.
``$<TARGET_POLICY:pol>``
``1`` if the policy ``pol`` was NEW when the 'head' target was created,
else ``0``. If the policy was not set, the warning message for the policy
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-generator-expressions.7.rst | 5 +++++
Source/cmTargetLinkOptionsCommand.cxx | 4 ++--
Tests/CMakeCommands/target_link_options/CMakeLists.txt | 8 ++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list