Source: cmake
Version: 2.8.7-3
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256


The module FindCxxTest.cmake doesn't support CxxTest version 4 where
the Perl generator has been removed upstream and the Python generator
is installed without the ".py" extension.

Attached to this report a simple patch that allows FindCxxTest.cmake
module to correctly locate the new Python generator.



- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (900, 'testing'), (12, 'unstable'), (12, 'stable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJPV65YAAoJEFZ1rdOc8CImI/IP/j48ioof3QmDeC2mFvGAEM6B
VEDUt6FDRtHSMzoX000+yVtubkwvQ6tzrzEtmaIWNRwsDV2Ak57HNFAcTykypbZ+
Ne5NvwIY003GjkYFkPq1wFyoQ/XsP7q7CxlDyQQo2TxnFtbGcr8USOk7rrNEI2oG
D2hpcWUqnw55JdyIkS2oq1LrkqztBbcy3XYS/akpkjPN2VD/yQSfoQamUcMB1toh
/t4rw2qoBNogvpsgW/enAL1BNCGDwXS67tryQa/yhUhSzyB/pjSXsW1ejbIfJi7y
21QUsd6E8sYXVtrqP55hjTXm/YC0LpdL6U1fmohTnupKxx18ogXgJhjjLYoPKMbI
/Z7CiIxn7Pu279ystw+JRFuoobLcOiaReedRCQT3i/RsSiEhAPdef1MLG3TQxfkZ
P4kDlGIM9WxHDI8UTCRqnFHR+pPKYc/ruN5SseBiQkX/zo2FcP38bG59gJ5UCuU2
uldQJe23GC3/VSu4bNGdSFD0KvkkvUg5/sY3K+IJi208zX1vfUE+X/CHI4OUgxom
hZEdqojHaSebORR616Cn9U4vJgNIf5DoMb84SVBT/VqMbWg9CxDEdNF68IE102ET
UtzUDCA68R5HUq/9fEZla46TIt+e0kFisSApWJlNeXG0OeCEfLxv/q2r2j2VkHjx
O8GSFiHma/VFge5L3An/
=yfMz
-----END PGP SIGNATURE-----
Description: Since CxxTest v4 the Python generator is without '.py' extension
 Since CxxTest v4 the Python generator has been renamed to 'cxxtestgen'
 without the '.py' extension present in previous versions. With this patch
 the FindCxxTest module will search also for 'cxxtestgen', leaving backward
 compatibility. In addition, the Perl generator is no more present so, even
 if the variable CXXTEST_USE_PYTHON is not defined, this module will try to
 use the Python generator instead of the Perl one.
Author: Simone Rossetto <simro...@gmail.com>
Forwarded: http://public.kitware.com/Bug/view.php?id=13022
Last-Update: 2012-03-06
--- 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(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 @@
 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

Reply via email to