From f0edae98ea1a4f90370c42924dbb0856e6fedd47 Mon Sep 17 00:00:00 2001 From: Philip Lowman Date: Mon, 2 Mar 2009 20:29:38 -0500 Subject: [PATCH] ENH: Detect perl & python scripts based on CXXTEST_INCLUDE_DIR (patch from Tyler Roscoe on mailing list). --- Modules/FindCxxTest.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index a022bfc9f..8964bc605 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -64,6 +64,9 @@ # }; # # +# Version 1.2 (3/2/08) +# Included patch from Tyler Roscoe to have the perl & python binaries +# detected based on CXXTEST_INCLUDE_DIR # Version 1.1 (2/9/08) # Clarified example to illustrate need to call target_link_libraries() # Changed commands to lowercase @@ -117,8 +120,10 @@ endmacro(CXXTEST_ADD_TEST) #============================================================= find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h) -find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl) -find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py) +find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl + PATHS ${CXXTEST_INCLUDE_DIR}) +find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py + PATHS ${CXXTEST_INCLUDE_DIR}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR)