GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 10:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also use FindPythonInterp when gathering the tests

Browse Source
This commit is contained in:
Ghostkeeper 2020-08-20 14:34:36 +02:00
parent 808a0bf4aa
commit 7f70acbaf1
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/CuraTests.cmake
View File

@ -4,18 +4,11 @@
include(CTest) include(CTest)
include(CMakeParseArguments) include(CMakeParseArguments)
# FIXME: Remove the code for CMake <3.12 once we have switched over completely. # FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment.
# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 # So we're using the old method here, with FindPythonInterp for now.
# module is copied from the CMake repository here so in CMake <3.12 we can still use it. find_package(PythonInterp 3 REQUIRED)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
# Use FindPythonInterp and FindPythonLibs for CMake <3.12
find_package(PythonInterp 3 REQUIRED)
set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
else()
# Use FindPython3 for CMake >=3.12
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
endif()
add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose) add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose)