[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.98 1.99

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jul 24 16:31:36 EDT 2009


Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv7391/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Close endif statements with same string as if so that it still configures with CMake 2.4 -- also check for existence of FindCVS.cmake before doing find_package(CVS QUIET) also for CMake 2.4 sake...


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.98
retrieving revision 1.99
diff -C 2 -d -r1.98 -r1.99
*** CMakeLists.txt	24 Jul 2009 20:15:10 -0000	1.98
--- CMakeLists.txt	24 Jul 2009 20:31:33 -0000	1.99
***************
*** 40,55 ****
    # Should tests that use CVS be run?
    #
-   find_package(CVS)
    set(do_cvs_tests 0)
  
!   if(CVS_EXECUTABLE)
!     set(do_cvs_tests 1)
!   endif()
  
    if(do_cvs_tests AND NOT UNIX)
      if("${CVS_EXECUTABLE}" MATCHES "cygwin")
        set(do_cvs_tests 0)
!     endif()
!   endif()
  
    # Should CPack tests be run? By default, yes, but...
--- 40,58 ----
    # Should tests that use CVS be run?
    #
    set(do_cvs_tests 0)
  
!   if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
!     find_package(CVS QUIET)
! 
!     if(CVS_EXECUTABLE)
!       set(do_cvs_tests 1)
!     endif(CVS_EXECUTABLE)
!   endif(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
  
    if(do_cvs_tests AND NOT UNIX)
      if("${CVS_EXECUTABLE}" MATCHES "cygwin")
        set(do_cvs_tests 0)
!     endif("${CVS_EXECUTABLE}" MATCHES "cygwin")
!   endif(do_cvs_tests AND NOT UNIX)
  
    # Should CPack tests be run? By default, yes, but...



More information about the Cmake-commits mailing list