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 fe9a903d8ee70b62a9d598dcfebeab0ded0b2e05 (commit)
via 90bb63a5ef9805519c12cc693a7c3d23b990a42c (commit)
via ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336 (commit)
via ef5875b5593833ba99bc7a8afd23a1c9cd80cd3e (commit)
via b7509dd674d9e0a1e428c5f4ceff7b78b47ac296 (commit)
via 3fb146cb1149ecb90404a5276c8db3cb46e00889 (commit)
via 847e8bc98c68cdf5bc0b7935c68764c0a6d5658e (commit)
from 696b2d40d4bdf5a8094f7d7c3e9ac66b039f34bf (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=fe9a903d8ee70b62a9d598dcfebeab0ded0b2e05
commit fe9a903d8ee70b62a9d598dcfebeab0ded0b2e05
Merge: 90bb63a b7509dd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 11 12:36:49 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Oct 11 08:36:57 2019 -0400
Merge topic 'cmake-bin-link-job-pool'
b7509dd674 Add option to configure Ninja link job pool for CMake's own
binaries
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3901
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90bb63a5ef9805519c12cc693a7c3d23b990a42c
commit 90bb63a5ef9805519c12cc693a7c3d23b990a42c
Merge: ae24597 ef5875b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 11 08:35:02 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Oct 11 08:35:02 2019 -0400
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336
commit ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336
Merge: 696b2d4 3fb146c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 11 12:34:08 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Oct 11 08:34:16 2019 -0400
Merge topic 'intel-19-compile-features'
3fb146cb11 Tests: Update CompileFeatures test for Intel 19 with VS 2015
847e8bc98c Intel: Fix default C++ dialect detection on Windows
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3900
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7509dd674d9e0a1e428c5f4ceff7b78b47ac296
commit b7509dd674d9e0a1e428c5f4ceff7b78b47ac296
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 13:28:08 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 10 13:28:45 2019 -0400
Add option to configure Ninja link job pool for CMake's own binaries
Create an undocumented `CMake_JOB_POOL_LINK_BIN` option that builders
can set to avoid linking too many of our binaries at once.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 63e08de..d89a69d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1193,6 +1193,11 @@ if(WIN32)
endforeach()
endif()
+if(CMake_JOB_POOL_LINK_BIN)
+ set_property(TARGET ${_tools} PROPERTY JOB_POOL_LINK "link-bin")
+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS
"link-bin=${CMake_JOB_POOL_LINK_BIN}")
+endif()
+
# Install tools
foreach(_tool ${_tools})
diff --git a/Source/CursesDialog/CMakeLists.txt
b/Source/CursesDialog/CMakeLists.txt
index 7009717..a9e46fd 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -34,5 +34,9 @@ else()
target_link_libraries(ccmake cmForm)
endif()
+if(CMake_JOB_POOL_LINK_BIN)
+ set_property(TARGET ccmake PROPERTY JOB_POOL_LINK "link-bin")
+endif()
+
CMake_OPTIONAL_COMPONENT(ccmake)
install(TARGETS ccmake DESTINATION ${CMAKE_BIN_DIR} ${COMPONENT})
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index cb89d19..98dd0e2 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -178,6 +178,10 @@ if(WIN32)
target_sources(cmake-gui PRIVATE $<TARGET_OBJECTS:CMakeVersion>)
endif()
+if(CMake_JOB_POOL_LINK_BIN)
+ set_property(TARGET cmake-gui PROPERTY JOB_POOL_LINK "link-bin")
+endif()
+
# cmake-gui has not been updated for `include-what-you-use`.
# Block the tool until this is done.
set_target_properties(cmake-gui PROPERTIES
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCXXCompilerId.cpp.in | 16 +++++++++++++---
Source/CMakeLists.txt | 5 +++++
Source/CursesDialog/CMakeLists.txt | 4 ++++
Source/QtDialog/CMakeLists.txt | 4 ++++
Tests/CompileFeatures/CMakeLists.txt | 6 ++++++
Tests/CompileFeatures/default_dialect.cpp | 12 +++++++++++-
6 files changed, 43 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
