diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2018-03-05 15:27:26 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@sap.com> | 2018-03-20 08:29:55 (GMT) |
| commit | 50b5e9ed1316f82976a45c5fb2b00d0d3a3e4438 (patch) | |
| tree | c09daa8de0a151b6e79c44608365de413b7bad25 /Modules/FindCxxTest.cmake | |
| parent | 352baee2074d12637c65e3113f560bbf98d0640a (diff) | |
| download | CMake-50b5e9ed1316f82976a45c5fb2b00d0d3a3e4438.zip CMake-50b5e9ed1316f82976a45c5fb2b00d0d3a3e4438.tar.gz CMake-50b5e9ed1316f82976a45c5fb2b00d0d3a3e4438.tar.bz2 | |
CMake build: Use new FindPython module
Diffstat (limited to 'Modules/FindCxxTest.cmake')
| -rw-r--r-- | Modules/FindCxxTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index 2aa5f6f..25454fd 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -196,7 +196,7 @@ if(NOT DEFINED CXXTEST_TESTGEN_ARGS) set(CXXTEST_TESTGEN_ARGS --error-printer) endif() -find_package(PythonInterp QUIET) +find_package(Python QUIET) find_package(Perl QUIET) find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h) @@ -206,17 +206,17 @@ find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl PATHS ${CXXTEST_INCLUDE_DIR}) -if(PYTHONINTERP_FOUND OR PERL_FOUND) +if(PYTHON_FOUND OR PERL_FOUND) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) - if(PYTHONINTERP_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND OR NOT DEFINED CXXTEST_USE_PYTHON)) + if(PYTHON_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND OR NOT DEFINED CXXTEST_USE_PYTHON)) set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE}) execute_process(COMMAND ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --version OUTPUT_VARIABLE _CXXTEST_OUT ERROR_VARIABLE _CXXTEST_OUT RESULT_VARIABLE _CXXTEST_RESULT) if(_CXXTEST_RESULT EQUAL 0) set(CXXTEST_TESTGEN_INTERPRETER "") else() - set(CXXTEST_TESTGEN_INTERPRETER ${PYTHON_EXECUTABLE}) + set(CXXTEST_TESTGEN_INTERPRETER ${Python_EXECUTABLE}) endif() FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR CXXTEST_PYTHON_TESTGEN_EXECUTABLE) |