diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-11 13:15:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-11 13:16:38 (GMT) |
| commit | 31b2cc6187334313a14ecfcbf864317cc907a588 (patch) | |
| tree | e958b8c761faa3aaf017b5f581424d2edc3ecea6 | |
| parent | bdc04fd33a1a289f1192ea6b6319ab6dcb419617 (diff) | |
| parent | 7253b49ca9079290df834ddcf8258b9ea5dd2c9d (diff) | |
| download | CMake-31b2cc6187334313a14ecfcbf864317cc907a588.zip CMake-31b2cc6187334313a14ecfcbf864317cc907a588.tar.gz CMake-31b2cc6187334313a14ecfcbf864317cc907a588.tar.bz2 | |
Merge topic 'rel-test-python'
7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4339
| -rw-r--r-- | Utilities/Release/win32_release.cmake | 1 | ||||
| -rw-r--r-- | Utilities/Release/win64_release.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index 14e5cba..993db6e 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -34,6 +34,7 @@ CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs} CMAKE_PREFIX_PATH:STRING=${qt_prefix} CMake_TEST_Qt4:BOOL=OFF CMake_TEST_Qt5:BOOL=OFF +PYTHON_EXECUTABLE:FILEPATH=C:/Python/3.8-64/python.exe ") set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") set(CFLAGS "${ppflags}") diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 149d378..3042889 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -34,6 +34,7 @@ CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs} CMAKE_PREFIX_PATH:STRING=${qt_prefix} CMake_TEST_Qt4:BOOL=OFF CMake_TEST_Qt5:BOOL=OFF +PYTHON_EXECUTABLE:FILEPATH=C:/Python/3.8-64/python.exe ") set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") set(CFLAGS "${ppflags}") |