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 5e2d22c177add56b2538ab10954dfb049c5cf945 (commit)
via 52b298bd031d97df7cdb36e6386ebbfab10946b7 (commit)
from 3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 (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=5e2d22c177add56b2538ab10954dfb049c5cf945
commit 5e2d22c177add56b2538ab10954dfb049c5cf945
Merge: 3cb5a8d9 52b298b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 13:22:25 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jun 3 09:22:33 2019 -0400
Merge topic 'FindPython-Python_ROOT_DIR-searched-first'
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3408
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52b298bd031d97df7cdb36e6386ebbfab10946b7
commit 52b298bd031d97df7cdb36e6386ebbfab10946b7
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Fri May 31 19:05:04 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Fri May 31 19:05:04 2019 +0200
FindPython: ensure Python_ROOT_DIR is always searched first
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 5d39240..49d8e26 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1228,6 +1228,7 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
NAMES_PER_DIR
+ HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
NO_CMAKE_PATH
@@ -1338,6 +1339,7 @@ if ("Development" IN_LIST
${_PYTHON_PREFIX}_FIND_COMPONENTS
find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
NAMES_PER_DIR
+ HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
NO_CMAKE_PATH
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPython/Support.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
