diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml index ebb2cdba181e1676ad0cd8810120f3d9ba0763d0..2fb29d135b840ae1975c695e8d7bb7bf89cf7265 100644 --- a/scripts/ci/jobs/build-linux.yml +++ b/scripts/ci/jobs/build-linux.yml @@ -5,7 +5,10 @@ build linux: - docker variables: BUILD_DIR: "build" - CMAKE_ARGS: "-DOGS_USE_CONAN=OFF" + CMAKE_ARGS: >- + -DOGS_BUILD_UTILS=ON + -DOGS_USE_CONAN=OFF + -DOGS_USE_PYTHON=ON image: name: $CONTAINER_GCC_IMAGE needs: [meta] diff --git a/scripts/ci/jobs/build-mac.yml b/scripts/ci/jobs/build-mac.yml index 3a6e5f232bc29fb45a528bd7a820521a02e76fc6..0632b6634fd55878d08b6d606d742f24eb815df4 100644 --- a/scripts/ci/jobs/build-mac.yml +++ b/scripts/ci/jobs/build-mac.yml @@ -5,3 +5,6 @@ build mac: needs: [meta] variables: BUILD_DIR: "build-mac" + CMAKE_ARGS: >- + -DOGS_BUILD_UTILS=ON + -DOGS_USE_PYTHON=ON diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml index c43fbcd1d84b48543a9b1ca15f310b87a8ee6b35..1f3212e46ff2450b452581298b65c3cd3dddba90 100644 --- a/scripts/ci/jobs/build-win.yml +++ b/scripts/ci/jobs/build-win.yml @@ -4,5 +4,6 @@ build win: variables: BUILD_DIR: build-win CMAKE_ARGS: >- - -DOGS_USE_PYTHON=ON + -DOGS_BUILD_UTILS=ON -DOGS_CI_TESTRUNNER_REPEAT=1 + -DOGS_USE_PYTHON=ON diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index 08f65553ba02858f9fbf8774cfed9a9589bf6438..392ecab10888bc675e442bb9120f34b49712d3e2 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 8d8c0a6e82fa0287139a84a42bcd1ae5afd947bd..9152c9f0924e14ed0978a3e41ed72e78ffdb7bb4 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)