diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-21 15:36:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-21 15:36:08 (GMT) |
| commit | 0c557a0cab681b17dbd4ed06f7776459880a90ea (patch) | |
| tree | 3ddaf905375d4d77bb1b12e614f0085397ed9bd6 /Modules | |
| parent | 1174efb6f9f25d5624ef60dc3cca88388ac302bc (diff) | |
| parent | 71e6854b22b6076606ecaf891f7b9be689bf74db (diff) | |
| download | CMake-0c557a0cab681b17dbd4ed06f7776459880a90ea.zip CMake-0c557a0cab681b17dbd4ed06f7776459880a90ea.tar.gz CMake-0c557a0cab681b17dbd4ed06f7776459880a90ea.tar.bz2 | |
Merge topic 'FindPython-debug-library-lookup' into release-3.17
71e6854b22 FindPython: use CMAKE specific variables to look-up debug library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4764
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPython/Support.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 5a08b4b..8aa7b97 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -22,9 +22,9 @@ endif() if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) message (FATAL_ERROR "FindPython: INTERNAL ERROR") endif() -if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) +if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) +elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) else() message (FATAL_ERROR "FindPython: INTERNAL ERROR") @@ -2119,6 +2119,12 @@ if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS NAMES_PER_DIR HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS} NO_DEFAULT_PATH) + # second try including CMAKE variables to catch-up non conventional layouts + find_library (_${_PYTHON_PREFIX}_LIBRARY_DEBUG + NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES_DEBUG} + NAMES_PER_DIR + NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH) endif() # retrieve runtime libraries |