From aa169c95b663d4b3e4e2ab190b3a2405068df96c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 29 Jun 2020 10:38:50 +0200
Subject: [PATCH] [CMake] Pass the correct python interpreter to ctest.
Ensures that the benchmark uses the same interpreter as the build
used for the bindings. Will fix ci mac-job.
---
scripts/cmake/test/AddTest.cmake | 1 +
scripts/cmake/test/AddTestWrapper.cmake | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 08f65553ba0..392ecab1088 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -245,6 +245,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
-DWRAPPER_COMMAND=${WRAPPER_COMMAND}
"-DWRAPPER_ARGS=${AddTest_WRAPPER_ARGS}"
"-DFILES_TO_DELETE=${FILES_TO_DELETE}"
+ -DPython3_EXECUTABLE=${Python3_EXECUTABLE}
-P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestWrapper.cmake
)
set_tests_properties(${TEST_NAME} PROPERTIES COST ${AddTest_RUNTIME})
diff --git a/scripts/cmake/test/AddTestWrapper.cmake b/scripts/cmake/test/AddTestWrapper.cmake
index 8d8c0a6e82f..9152c9f0924 100644
--- a/scripts/cmake/test/AddTestWrapper.cmake
+++ b/scripts/cmake/test/AddTestWrapper.cmake
@@ -12,7 +12,7 @@ endif()
if(EXISTS ${SOURCE_PATH}/requirements.txt AND NOT EXISTS ${BINARY_PATH}/${PIP})
message(STATUS "Generating Python virtual environment...")
execute_process(
- COMMAND virtualenv .venv
+ COMMAND virtualenv --python ${Python3_EXECUTABLE} .venv
WORKING_DIRECTORY ${BINARY_PATH})
endif()
if(EXISTS ${SOURCE_PATH}/requirements.txt)
--
GitLab