diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-12 12:18:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 12:18:54 (GMT) |
| commit | c278b4eda9116e57e158e12aa8e836c3edc8fdf3 (patch) | |
| tree | 41e4c9d08e782ddf6abdd49660e82097f3cb1d76 | |
| parent | c5f850d1455cad84a786ff249c9602804ef59041 (diff) | |
| parent | 10447764727e2d54a813e66b62abc3c61a4ad7f8 (diff) | |
| download | CMake-c278b4eda9116e57e158e12aa8e836c3edc8fdf3.zip CMake-c278b4eda9116e57e158e12aa8e836c3edc8fdf3.tar.gz CMake-c278b4eda9116e57e158e12aa8e836c3edc8fdf3.tar.bz2 | |
Merge topic 'FindPython-ENV-CMAKE_FRAMEWORK_PATH' into release-3.17
1044776472 FindPython: Convert env CMAKE_FRAMEWORK_PATH to CMake path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !4462
| -rw-r--r-- | Modules/FindPython/Support.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index bf55bf5..32c5283 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -97,8 +97,9 @@ endmacro() macro (_PYTHON_FIND_FRAMEWORKS) set (${_PYTHON_PREFIX}_FRAMEWORKS) if (CMAKE_HOST_APPLE OR APPLE) + file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _pff_CMAKE_FRAMEWORK_PATH) set (_pff_frameworks ${CMAKE_FRAMEWORK_PATH} - $ENV{CMAKE_FRAMEWORK_PATH} + ${_pff_CMAKE_FRAMEWORK_PATH} ~/Library/Frameworks /usr/local/Frameworks ${CMAKE_SYSTEM_FRAMEWORK_PATH}) |