diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-11 15:04:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-11 15:07:58 (GMT) |
| commit | 192ab741ec65c96945893367bd3d04c08ca0f47a (patch) | |
| tree | 3b16db69ea784ca4390f0a3067891ac4873205a4 /Modules/FindPythonLibs.cmake | |
| parent | 3976a1066afc89e23f4f7be2040c1e7835324f03 (diff) | |
| download | CMake-192ab741ec65c96945893367bd3d04c08ca0f47a.zip CMake-192ab741ec65c96945893367bd3d04c08ca0f47a.tar.gz CMake-192ab741ec65c96945893367bd3d04c08ca0f47a.tar.bz2 | |
FindPythonLibs: Allow find_library to search paths from system environment
Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library`
calls. No other find modules do this. Also, since commit
v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from
PATH, 2015-02-18) we always search the `lib` directory of each prefix
before the `bin` directory and so should prefer the non-`.dll` name.
Issue: #17336
Diffstat (limited to 'Modules/FindPythonLibs.cmake')
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 986726a..341d5d9 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -153,15 +153,11 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) ${PYTHON_FRAMEWORK_LIBRARIES} [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs - # Avoid finding the .dll in the PATH. We want the .lib. - NO_SYSTEM_ENVIRONMENT_PATH ) # Look for the static library in the Python config directory find_library(PYTHON_LIBRARY NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} NAMES_PER_DIR - # Avoid finding the .dll in the PATH. We want the .lib. - NO_SYSTEM_ENVIRONMENT_PATH # This is where the static library is usually located PATH_SUFFIXES python${_CURRENT_VERSION}/config ) |