[FIX #229] Now the new FindCxxtest.cmake script will find CxxTest even when...

[FIX #229] Now the new FindCxxtest.cmake script will find CxxTest even when its not installed inside of /usr/local. But therefore it requires an additional cmake script: FindPackageHandleStandardArgs.cmake which is included in CMake since 2.6.0 and as we depend on 2.8 it should be available in all our build systems. I've tested this on Mac as well as on Linux where as on Linux machines there were one test failing compiled with clang, but this is not an issue of the CMake find script.

tools/cmake/FindCxxTest.cmake

@@ -5,20 +5,38 @@
 #
 # INPUT Variables
 #
-#   CXXTEST_USE_PYTHON
-#       If true, the CXXTEST_ADD_TEST macro will use
-#       the Python test generator instead of Perl.
+#   CXXTEST_USE_PYTHON [deprecated since 1.3]
+#       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
+#       generator was used instead of the Perl one,
+#       regardless of which scripting language the
+#       user had installed.
+#
+#   CXXTEST_TESTGEN_ARGS (since CMake 2.8.3)
+#       Specify a list of options to pass to the CxxTest code
+#       generator.  If not defined, --error-printer is
+#       passed.
 #
 # OUTPUT Variables
 #
 #   CXXTEST_FOUND
 #       True if the CxxTest framework was found
-#   CXXTEST_INCLUDE_DIR
+#   CXXTEST_INCLUDE_DIRS
 #       Where to find the CxxTest include directory
 #   CXXTEST_PERL_TESTGEN_EXECUTABLE
-#       The perl-based test generator.
+#       The perl-based test generator
 #   CXXTEST_PYTHON_TESTGEN_EXECUTABLE
-#       The python-based test generator.
+#       The python-based test generator
+#   CXXTEST_TESTGEN_EXECUTABLE (since CMake 2.8.3)
+#       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
 #
 # MACROS for optional use by CMake users:
 #
@@ -26,10 +44,12 @@
 #       Creates a CxxTest runner and adds it to the CTest testing suite
 #       Parameters:
 #           test_name               The name of the test
-#           gen_source_file         The generated source filename to be generated by CxxTest
+#           gen_source_file         The generated source filename to be
+#                                   generated by CxxTest
 #           input_files_to_testgen  The list of header files containing the
-#                                   CxxTest::TestSuite's to be included in this runner
-#
+#                                   CxxTest::TestSuite's to be included in
+#                                   this runner
+#           
 #       #==============
 #       Example Usage:
 #
@@ -39,7 +59,7 @@
 #               enable_testing()
 #
 #               CXXTEST_ADD_TEST(unittest_foo foo_test.cc
-#                                 ${CMAKE_CURRENT_SOURCE_DIR}/foo_test.h other.cpp)
+#                                 ${CMAKE_CURRENT_SOURCE_DIR}/foo_test.h)
 #               target_link_libraries(unittest_foo foo) # as needed
 #           endif()
 #
@@ -47,14 +67,13 @@
 #              1. Invoke the testgen executable to autogenerate foo_test.cc in the
 #                 binary tree from "foo_test.h" in the current source directory.
 #              2. Create an executable and test called unittest_foo.
-#              3. Link additionally against other.cpp
-#
+#               
 #      #=============
 #      Example foo_test.h:
 #
 #          #include <cxxtest/TestSuite.h>
-#
-#          class MyTestSuite : public CxxTest::TestSuite
+#          
+#          class MyTestSuite : public CxxTest::TestSuite 
 #          {
 #          public:
 #             void testAddition( void )
@@ -64,7 +83,34 @@
 #             }
 #          };
 #
-#
+
+#=============================================================================
+# Copyright 2008-2010 Kitware, Inc.
+# Copyright 2008-2010 Philip Lowman <philip@yhbt.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Version 1.4 (11/18/10) (CMake 2.8.4)
+#     Issue 11384: Added support to the CXX_ADD_TEST macro so header
+#                  files (containing the tests themselves) show up in
+#                  Visual Studio and other IDEs.
+#
+# Version 1.3 (8/19/10) (CMake 2.8.3)
+#     Included patch by Simone Rossetto to check if either Python or Perl
+#     are present in the system.  Whichever intepreter that is detected
+#     is now used to run the test generator program.  If both interpreters
+#     are detected, the CXXTEST_USE_PYTHON variable is obeyed.
+#
+#     Also added support for CXXTEST_TESTGEN_ARGS, for manually specifying
+#     options to the CxxTest code generator.
 # Version 1.2 (3/2/08)
 #     Included patch from Tyler Roscoe to have the perl & python binaries
 #     detected based on CXXTEST_INCLUDE_DIR
@@ -76,31 +122,18 @@
 #     Fixed CXXTEST_INCLUDE_DIRS so it will work properly
 #     Eliminated superfluous CXXTEST_FOUND assignment
 #     Cleaned up and added more documentation
-#
-# FindCxxTest.cmake
-# Copyright (c) 2008-2009
-#     Philip Lowman <philip@yhbt.com>
-#
-#  Redistribution AND use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 #=============================================================
 # CXXTEST_ADD_TEST (public macro)
 #=============================================================
-macro( CXXTEST_ADD_TEST _cxxtest_testname _cxxtest_outfname _cxxtest_testsuite )
+macro(CXXTEST_ADD_TEST _cxxtest_testname _cxxtest_outfname)
     set(_cxxtest_real_outfname ${CMAKE_CURRENT_BINARY_DIR}/${_cxxtest_outfname})
-    if(CXXTEST_USE_PYTHON)
-        set(_cxxtest_executable ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE})
-    else()
-        set(_cxxtest_executable ${CXXTEST_PERL_TESTGEN_EXECUTABLE})
-    endif()
 
     add_custom_command(
         OUTPUT  ${_cxxtest_real_outfname}
-        DEPENDS ${_cxxtest_testsuite} ${ARGN}
-        COMMAND ${_cxxtest_executable}
-        --error-printer -o ${_cxxtest_real_outfname} ${_cxxtest_testsuite}
+        DEPENDS ${ARGN}
+        COMMAND ${CXXTEST_TESTGEN_INTERPRETER}
+        ${CXXTEST_TESTGEN_EXECUTABLE} ${CXXTEST_TESTGEN_ARGS} -o ${_cxxtest_real_outfname} ${ARGN}
     )
 
     set_source_files_properties(${_cxxtest_real_outfname} PROPERTIES GENERATED true)
@@ -166,18 +199,53 @@ FUNCTION( CXXTEST_ADD_TESTS_FROM_LIST _SourceList _TestLibs )
     ENDFOREACH( _ClassName )
 ENDFUNCTION( CXXTEST_ADD_TESTS_FROM_LIST )
 
+
 #=============================================================
 # main()
 #=============================================================
+if(NOT DEFINED CXXTEST_TESTGEN_ARGS)
+   set(CXXTEST_TESTGEN_ARGS --error-printer)
+endif()
+
+find_package(PythonInterp QUIET)
+find_package(Perl QUIET)
 
 find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h)
+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})
-find_program(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py
-    NAMES cxxtestgen
-    PATHS ${CXXTEST_INCLUDE_DIR})
+         PATHS ${CXXTEST_INCLUDE_DIR})
+
+if(PYTHONINTERP_FOUND OR PERL_FOUND)
+   include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) # It is available since CMAKE 2.6 and we require 2.8 anyways
+
+   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
+          CXXTEST_INCLUDE_DIR CXXTEST_PYTHON_TESTGEN_EXECUTABLE)
+
+   elseif(PERL_FOUND)
+      set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PERL_TESTGEN_EXECUTABLE})
+      set(CXXTEST_TESTGEN_INTERPRETER ${PERL_EXECUTABLE})
+      FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG
+          CXXTEST_INCLUDE_DIR CXXTEST_PERL_TESTGEN_EXECUTABLE)
+   endif()
+
+   if(CXXTEST_FOUND)
+      set(CXXTEST_INCLUDE_DIRS ${CXXTEST_INCLUDE_DIR})
+   endif()
+
+else()
 
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR)
+   set(CXXTEST_FOUND false)
+   if(NOT CxxTest_FIND_QUIETLY)
+      if(CxxTest_FIND_REQUIRED)
+         message(FATAL_ERROR "Neither Python nor Perl found, cannot use CxxTest, aborting!")
+      else()
+         message(STATUS "Neither Python nor Perl found, CxxTest will not be used.")
+      endif()
+   endif()
 
-set(CXXTEST_INCLUDE_DIRS ${CXXTEST_INCLUDE_DIR})
+endif()