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 c86476549653f9915a4b9f4cc32d3e569f959d38 (commit)
via b51b6cc5721779db6bcd9273db6ad2bf40e40c94 (commit)
via d7d282cd89d0da0a9f192868eb5028c4a3f72587 (commit)
via eda4c43879522438622ad75a5204666011198203 (commit)
via 736f38ff3434e168a5548d3d2a0897934fa5de9a (commit)
via f57a53d43e1ec693fdbb749fc279fc79f33a8866 (commit)
from b598c64954ac33cc590ab99a3561ed0e806c3536 (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=c86476549653f9915a4b9f4cc32d3e569f959d38
commit c86476549653f9915a4b9f4cc32d3e569f959d38
Merge: b51b6cc eda4c43
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 11:00:55 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:02:11 2019 -0400
Merge topic 'ninja-nvcc-rsp'
eda4c43879 Ninja: Fix CUDA device linking when using response files
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3482
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b51b6cc5721779db6bcd9273db6ad2bf40e40c94
commit b51b6cc5721779db6bcd9273db6ad2bf40e40c94
Merge: d7d282c 736f38f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 10:59:38 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 07:00:41 2019 -0400
Merge topic 'iconv-c++11'
736f38ff34 FindIconv test: request C++11
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3469
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7d282cd89d0da0a9f192868eb5028c4a3f72587
commit d7d282cd89d0da0a9f192868eb5028c4a3f72587
Merge: b598c64 f57a53d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 26 10:59:10 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 26 06:59:33 2019 -0400
Merge topic 'doc-CMAKE_FRAMEWORK-crossref'
f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target
prop
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3478
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda4c43879522438622ad75a5204666011198203
commit eda4c43879522438622ad75a5204666011198203
Author: Francisco Facioni <francisco.faci...@hawkeyeinnovations.com>
AuthorDate: Tue Jun 25 17:59:08 2019 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 25 14:30:36 2019 -0400
Ninja: Fix CUDA device linking when using response files
Fix the logic added by commit d91b5a72cd (Ninja: Add support for CUDA
nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) to always use the CUDA
compiler response file flag for response files during device linking.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index 7ad8ab3..f65abc8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -171,20 +171,9 @@ void
cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile)
vars.Language = "CUDA";
- std::string responseFlag;
-
- std::string cmakeVarLang = "CMAKE_";
- cmakeVarLang += this->TargetLinkLanguage;
-
// build response file name
- std::string cmakeLinkVar = cmakeVarLang + "_RESPONSE_FILE_LINK_FLAG";
- const char* flag = GetMakefile()->GetDefinition(cmakeLinkVar);
-
- if (flag) {
- responseFlag = flag;
- } else if (this->TargetLinkLanguage != "CUDA") {
- responseFlag = "@";
- }
+ std::string responseFlag = this->GetMakefile()->GetSafeDefinition(
+ "CMAKE_CUDA_RESPONSE_FILE_LINK_FLAG");
if (!useResponseFile || responseFlag.empty()) {
vars.Objects = "$in";
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=736f38ff3434e168a5548d3d2a0897934fa5de9a
commit 736f38ff3434e168a5548d3d2a0897934fa5de9a
Author: Rolf Eike Beer <e...@emlix.com>
AuthorDate: Mon Jun 24 13:18:31 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Tue Jun 25 15:14:02 2019 +0200
FindIconv test: request C++11
diff --git a/Tests/FindIconv/Test/CMakeLists.txt
b/Tests/FindIconv/Test/CMakeLists.txt
index c59adb3..a6243f5 100644
--- a/Tests/FindIconv/Test/CMakeLists.txt
+++ b/Tests/FindIconv/Test/CMakeLists.txt
@@ -6,9 +6,11 @@ find_package(Iconv REQUIRED)
add_executable(test_iconv_tgt main.cxx)
target_link_libraries(test_iconv_tgt Iconv::Iconv)
+target_compile_features(test_iconv_tgt PRIVATE cxx_std_11)
add_test(NAME test_iconv_tgt COMMAND test_iconv_tgt)
add_executable(test_iconv_var main.cxx)
target_include_directories(test_iconv_var PRIVATE ${Iconv_INCLUDE_DIRS})
target_link_libraries(test_iconv_var PRIVATE ${Iconv_LIBRARIES})
+target_compile_features(test_iconv_var PRIVATE cxx_std_11)
add_test(NAME test_iconv_var COMMAND test_iconv_var)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f57a53d43e1ec693fdbb749fc279fc79f33a8866
commit f57a53d43e1ec693fdbb749fc279fc79f33a8866
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Tue Jun 25 21:57:31 2019 +1000
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Tue Jun 25 21:57:31 2019 +1000
Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop
diff --git a/Help/prop_tgt/FRAMEWORK.rst b/Help/prop_tgt/FRAMEWORK.rst
index 9dad060..3dff1be 100644
--- a/Help/prop_tgt/FRAMEWORK.rst
+++ b/Help/prop_tgt/FRAMEWORK.rst
@@ -6,7 +6,9 @@ Build ``SHARED`` or ``STATIC`` library as Framework Bundle on
the macOS and iOS.
If such a library target has this property set to ``TRUE`` it will be
built as a framework when built on the macOS and iOS. It will have the
directory structure required for a framework and will be suitable to
-be used with the ``-framework`` option
+be used with the ``-framework`` option. This property is initialized by the
+value of the :variable:`CMAKE_FRAMEWORK` variable if it is set when a target is
+created.
To customize ``Info.plist`` file in the framework, use
:prop_tgt:`MACOSX_FRAMEWORK_INFO_PLIST` target property.
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/FRAMEWORK.rst | 4 +++-
Source/cmNinjaNormalTargetGenerator.cxx | 15 ++-------------
Tests/FindIconv/Test/CMakeLists.txt | 2 ++
3 files changed, 7 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
