diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-29 12:09:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-29 12:09:42 (GMT) |
| commit | 26b30c58d0cd674a50f5b5c5df9ee7d6968c57d1 (patch) | |
| tree | 1e86a4a9a198da7b16b6cfc920ab87f9b2d364d1 /Modules | |
| parent | b53a12c29cff61d8f97997a63a00e7ca59b566ba (diff) | |
| parent | 32ee69c56241e4991269a8d114339878363ead61 (diff) | |
| download | CMake-26b30c58d0cd674a50f5b5c5df9ee7d6968c57d1.zip CMake-26b30c58d0cd674a50f5b5c5df9ee7d6968c57d1.tar.gz CMake-26b30c58d0cd674a50f5b5c5df9ee7d6968c57d1.tar.bz2 | |
Merge topic 'FindCxxTest-no-unix-interp'
32ee69c5 FindCxxTest: Do not run cxxtestgen through interpreter unless necessary
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCxxTest.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index 62489f9..9ba1ff3 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -58,7 +58,8 @@ # The test generator that is actually used (chosen using user preferences # and interpreters found in the system) # CXXTEST_TESTGEN_INTERPRETER (since CMake 2.8.3) -# The full path to the Perl or Python executable on the system +# The full path to the Perl or Python executable on the system, on +# platforms where the script cannot be executed using its shebang line. # # # @@ -210,7 +211,13 @@ if(PYTHONINTERP_FOUND OR PERL_FOUND) if(PYTHONINTERP_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND OR NOT DEFINED CXXTEST_USE_PYTHON)) set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE}) - set(CXXTEST_TESTGEN_INTERPRETER ${PYTHON_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}) + endif() FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR CXXTEST_PYTHON_TESTGEN_EXECUTABLE) |