summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-06-03 13:22:25 +0000
committerKitware Robot <kwrobot@kitware.com>2019-06-03 09:22:33 -0400
commit5e2d22c177add56b2538ab10954dfb049c5cf945 (patch)
treecb911e5a53d8bc93a130cdcfba5af2fda9645414
parent3cb5a8d9b3add4394b12d61b5ce83ea6ca148fd1 (diff)
parent52b298bd031d97df7cdb36e6386ebbfab10946b7 (diff)
downloadcmake-5e2d22c177add56b2538ab10954dfb049c5cf945.tar.gz
Merge topic 'FindPython-Python_ROOT_DIR-searched-first'
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3408
-rw-r--r--Modules/FindPython/Support.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 5d39240897..49d8e26cdb 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