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 6dbc12df684e146d15e9d5f9a68972f0a2196e10 (commit)
via a1709057ef6fa557d9106bac0da54899952d5cba (commit)
via 24e7554e15f12233b6e2fd294b9be4c1f8c24a06 (commit)
via f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a (commit)
via 684338aff6cecad6e9ef32e321dd318081edb721 (commit)
via c9469c78a5545b5a04ecf0f27b50500140aca5e9 (commit)
via 68c8201711b93b6db224318404b14e62e04b462d (commit)
from 87120b9c2a1aae4671b674ad3e06cd9666d91752 (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=6dbc12df684e146d15e9d5f9a68972f0a2196e10
commit 6dbc12df684e146d15e9d5f9a68972f0a2196e10
Merge: a170905 68c8201
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 1 16:00:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed May 1 12:02:07 2019 -0400
Merge topic 'FindPython-NumPy-fix-dependencies-management'
68c8201711 FindPython: NumPy: fix erroneous dependencies management
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3274
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1709057ef6fa557d9106bac0da54899952d5cba
commit a1709057ef6fa557d9106bac0da54899952d5cba
Merge: 24e7554 f06bf0f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 1 16:00:26 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed May 1 12:00:54 2019 -0400
Merge topic 'FindBoost-fix-fiber-compiler-features'
f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context`
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3266
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24e7554e15f12233b6e2fd294b9be4c1f8c24a06
commit 24e7554e15f12233b6e2fd294b9be4c1f8c24a06
Merge: 87120b9 c9469c7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 1 11:59:52 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 1 11:59:52 2019 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a
commit f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a
Author: Alex Turbov <i.za...@gmail.com>
AuthorDate: Fri Apr 26 14:46:17 2019 +0800
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Apr 30 14:26:07 2019 -0400
FindBoost: Fix compiler features for `fiber` and `context`
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index cd79f24..552c2fd 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1072,6 +1072,8 @@ function(_Boost_COMPILER_FEATURES component _ret)
cxx_thread_local
cxx_variadic_templates
)
+ # Compiler feature for `context` same as for `fiber`.
+ set(_Boost_CONTEXT_COMPILER_FEATURES ${_Boost_FIBER_COMPILER_FEATURES})
endif()
string(TOUPPER ${component} uppercomponent)
set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=684338aff6cecad6e9ef32e321dd318081edb721
commit 684338aff6cecad6e9ef32e321dd318081edb721
Author: Alex Turbov <i.za...@gmail.com>
AuthorDate: Fri Apr 26 14:46:17 2019 +0800
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Apr 30 14:25:51 2019 -0400
FindBoost: Record compiler features for Boost 1.67 and above
Remove the 1.67 upper-bound on compiler feature computation so that with
newer versions we at least get it mostly right. Leave a comment with
notes about updating features for future versions.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index b5cc4cf..cd79f24 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1048,11 +1048,17 @@ endfunction()
# Some boost libraries may require particular set of compler features.
# The very first one was `boost::fiber` introduced in Boost 1.62.
# One can check required compiler features of it in
-# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
+# - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
+# - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
+#
+# TODO (Re)Check compiler features on (every?) release ???
+# One may use the following command to get the files to check:
+#
+# $ find . -name Jamfile.v2 | grep build | xargs grep -l cxx1
#
function(_Boost_COMPILER_FEATURES component _ret)
- # Boost >= 1.62 and < 1.67
- if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS
106700)
+ # Boost >= 1.62
+ if(NOT Boost_VERSION VERSION_LESS 106200)
set(_Boost_FIBER_COMPILER_FEATURES
cxx_alias_templates
cxx_auto_type
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9469c78a5545b5a04ecf0f27b50500140aca5e9
commit c9469c78a5545b5a04ecf0f27b50500140aca5e9
Merge: 0c2469e 3d37131
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Apr 30 13:55:48 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Apr 30 13:55:48 2019 -0400
Merge branch 'out-of-dir-linking-private-deps' into release-3.13
Merge-request: !3276
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68c8201711b93b6db224318404b14e62e04b462d
commit 68c8201711b93b6db224318404b14e62e04b462d
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Tue Apr 30 10:43:34 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Tue Apr 30 16:02:18 2019 +0200
FindPython: NumPy: fix erroneous dependencies management
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 1236bf8..8f67082 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -305,9 +305,9 @@ unset (_${_PYTHON_PREFIX}_CACHED_VARS)
# first step, search for the interpreter
if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+ list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
if (${_PYTHON_PREFIX}_FIND_REQUIRED_Interpreter)
list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
- list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
endif()
set (_${_PYTHON_PREFIX}_HINTS "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV
${_PYTHON_PREFIX}_ROOT_DIR)
@@ -548,9 +548,9 @@ endif()
# second step, search for compiler (IronPython)
if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+ list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_COMPILER)
if (${_PYTHON_PREFIX}_FIND_REQUIRED_Compiler)
list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_COMPILER)
- list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_COMPILER)
endif()
# IronPython specific artifacts
@@ -659,15 +659,15 @@ endif()
## Development environment is not compatible with IronPython interpreter
if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
AND NOT ${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "IronPython")
+ list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_LIBRARY
+ ${_PYTHON_PREFIX}_LIBRARY_RELEASE
+
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
+ ${_PYTHON_PREFIX}_LIBRARY_DEBUG
+
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
+ ${_PYTHON_PREFIX}_INCLUDE_DIR)
if (${_PYTHON_PREFIX}_FIND_REQUIRED_Development)
list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_LIBRARY
${_PYTHON_PREFIX}_INCLUDE_DIR)
- list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_LIBRARY
-
${_PYTHON_PREFIX}_LIBRARY_RELEASE
-
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
- ${_PYTHON_PREFIX}_LIBRARY_DEBUG
-
${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
- ${_PYTHON_PREFIX}_INCLUDE_DIR)
endif()
# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
@@ -1127,9 +1127,9 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
endif()
if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND
${_PYTHON_PREFIX}_Interpreter_FOUND)
+ list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS
${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR)
if (${_PYTHON_PREFIX}_FIND_REQUIRED_NumPy)
list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS
${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR)
- list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS
${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR)
endif()
execute_process(
COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
@@ -1158,6 +1158,10 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
AND ${_PYTHON_PREFIX}_Inte
set(${_PYTHON_PREFIX}_NumPy_VERSION
"${_${_PYTHON_PREFIX}_NumPy_VERSION}")
endif()
endif()
+ # final step: set NumPy founded only if Development component is founded as
well
+ if (NOT ${_PYTHON_PREFIX}_Development_FOUND)
+ set(${_PYTHON_PREFIX}_NumPy_FOUND FALSE)
+ endif()
endif()
# final validation
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 14 +++++++++++---
Modules/FindPython/Support.cmake | 22 +++++++++++++---------
2 files changed, 24 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
