[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.10 1.11

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 21 11:54:32 EST 2009


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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/X11/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** CMakeLists.txt	11 Apr 2008 14:23:27 -0000	1.10
--- CMakeLists.txt	21 Jan 2009 16:54:30 -0000	1.11
***************
*** 7,10 ****
--- 7,11 ----
  
  ADD_EXECUTABLE (UseX11 X11.c)
+ install(TARGETS UseX11 DESTINATION bin)
  
  # so for universal binaries this test will fail if 
***************
*** 27,35 ****
      ADD_EXECUTABLE(HelloWorldX11 HelloWorldX11.cxx)
      TARGET_LINK_LIBRARIES(HelloWorldX11 ${X11_LIBRARIES})
!     install( TARGETS HelloWorldX11 DESTINATION bin)
!     # build a CPack driven installer package
      set(CPACK_PACKAGE_NAME HelloWorldX11Package)
      set(CPACK_PACKAGE_EXECUTABLES HelloWorldX11 HelloWorldX11)
-     include(CPack)
    ENDIF(APPLE)
  ENDIF(X11_FOUND)
--- 28,40 ----
      ADD_EXECUTABLE(HelloWorldX11 HelloWorldX11.cxx)
      TARGET_LINK_LIBRARIES(HelloWorldX11 ${X11_LIBRARIES})
!     install(TARGETS HelloWorldX11 DESTINATION bin)
! 
!     set(CPACK_BINARY_OSXX11 "ON")
!     set(CPACK_BINARY_PACKAGEMAKER "OFF")
      set(CPACK_PACKAGE_NAME HelloWorldX11Package)
      set(CPACK_PACKAGE_EXECUTABLES HelloWorldX11 HelloWorldX11)
    ENDIF(APPLE)
  ENDIF(X11_FOUND)
+ 
+ # build a CPack driven installer package
+ include(CPack)



More information about the Cmake-commits mailing list