diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 15:34:36 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-08-20 15:34:36 +0300 |
| commit | 7f70acbaf1f6a5c6b1f77d9eed47ceb592256983 (patch) | |
| tree | 2c495ae5acb4f1680944434905a86c6917e46e93 /cmake | |
| parent | 808a0bf4aa7106eb90aabe1f0fe4848c4b765d7e (diff) | |
Also use FindPythonInterp when gathering the tests
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CuraTests.cmake | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 251bec5781..0e62b84efa 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -4,18 +4,11 @@ include(CTest) include(CMakeParseArguments) -# FIXME: Remove the code for CMake <3.12 once we have switched over completely. -# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 -# module is copied from the CMake repository here so in CMake <3.12 we can still use it. -if(${CMAKE_VERSION} VERSION_LESS 3.12) - # Use FindPythonInterp and FindPythonLibs for CMake <3.12 - find_package(PythonInterp 3 REQUIRED) +# FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment. +# So we're using the old method here, with FindPythonInterp for now. +find_package(PythonInterp 3 REQUIRED) - set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) -else() - # Use FindPython3 for CMake >=3.12 - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) -endif() +set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose) |