--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,11 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wmainCRTStartup") endif() +find_package(PythonInterp) if (BUILD_TESTING AND CATCH_BUILD_TESTING AND NOT_SUBPROJECT) + if (NOT PYTHONINTERP_FOUND) + message(FATAL_ERROR "Python not found, but required for tests") + endif() add_subdirectory(projects) endif() --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -317,7 +317,7 @@ set_tests_properties(NoTest PROPERTIES PASS_REGULAR_EXPRESSION "No test cases matched") # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable -add_test(NAME ApprovalTests COMMAND python ${CATCH_DIR}/scripts/approvalTests.py $) +add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $) set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed") if (CATCH_USE_VALGRIND)