diff options
author | Brad King <brad.king@kitware.com> | 2022-04-26 14:27:13 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-26 14:27:20 (GMT) |
commit | 28dc5ea9103b08f32cc04d494d0f73644d7d6846 (patch) | |
tree | 1c04a73a8c0031860763329b76ae8d4039664889 /.gitlab | |
parent | a0061a8cf9c7d335473419ad2931aab346a694aa (diff) | |
parent | 2c140ac7b1eafb61a9e74ac8da7f13b69e473507 (diff) | |
download | CMake-28dc5ea9103b08f32cc04d494d0f73644d7d6846.zip CMake-28dc5ea9103b08f32cc04d494d0f73644d7d6846.tar.gz CMake-28dc5ea9103b08f32cc04d494d0f73644d7d6846.tar.bz2 |
Merge topic 'ci-python'
2c140ac7b1 ci: Avoid finding Python via Windows Registry
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7203
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/configure_windows_common.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_common.cmake b/.gitlab/ci/configure_windows_common.cmake index a70d165..7467cfd 100644 --- a/.gitlab/ci/configure_windows_common.cmake +++ b/.gitlab/ci/configure_windows_common.cmake @@ -2,5 +2,6 @@ set(BUILD_QtDialog ON CACHE BOOL "") set(BUILD_CursesDialog ON CACHE BOOL "") set(CMAKE_PREFIX_PATH "$ENV{CI_PROJECT_DIR}/.gitlab/qt" CACHE STRING "") set(CMake_TEST_Java OFF CACHE BOOL "") +set(Python_FIND_REGISTRY NEVER CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") |