[Cmake-commits] CMake branch, next, updated. v2.8.7-3091-g80bc1c6

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  80bc1c645b4fcd356e120bc6b0988d21598aabb4 (commit)
       via  a556137608ac63318183c957c0c3f221fc943017 (commit)
      from  1cee05a76dbf24262cf3bd883d68eb9bb28e25a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bc1c645b4fcd356e120bc6b0988d21598aabb4
commit 80bc1c645b4fcd356e120bc6b0988d21598aabb4
Merge: 1cee05a a556137
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 7 08:03:23 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 7 08:03:23 2012 -0500

    Merge topic 'FindCxxTest-version-4-issue-13022' into next
    
    a556137 FindCxxTest: Add support for CxxTest 4 (#13022)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a556137608ac63318183c957c0c3f221fc943017
commit a556137608ac63318183c957c0c3f221fc943017
Author:     Droscy <droscy85 at yahoo.it>
AuthorDate: Wed Mar 7 07:57:47 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 7 07:59:45 2012 -0500

    FindCxxTest: Add support for CxxTest 4 (#13022)
    
    In CxxTest version 4 the Perl generator has been deleted and the
    Python generator is installed without the ".py" extension.

diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake
index 4ff310c..a4d1504 100644
--- a/Modules/FindCxxTest.cmake
+++ b/Modules/FindCxxTest.cmake
@@ -9,6 +9,7 @@
 #       Only used in the case both Python & Perl
 #       are detected on the system to control
 #       which CxxTest code generator is used.
+#       Valid only for CxxTest version 3.
 #
 #       NOTE: In older versions of this Find Module,
 #       this variable controlled if the Python test
@@ -159,7 +160,8 @@ find_package(PythonInterp QUIET)
 find_package(Perl QUIET)
 
 find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h)
-find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py
+find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE
+         NAMES cxxtestgen cxxtestgen.py
          PATHS ${CXXTEST_INCLUDE_DIR})
 find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl
          PATHS ${CXXTEST_INCLUDE_DIR})
@@ -167,7 +169,7 @@ find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl
 if(PYTHONINTERP_FOUND OR PERL_FOUND)
    include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
-   if(PYTHONINTERP_FOUND AND (CXXTEST_USE_PYTHON OR NOT 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})
       FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCxxTest.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake