[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8.12.2 1.8.12.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Apr 21 17:18:50 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/X11
In directory public:/mounts/ram/cvs-serv12357
Modified Files:
Tag: CMake-2-6
CMakeLists.txt
Log Message:
ENH: sneak a test into RC 5
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/X11/CMakeLists.txt,v
retrieving revision 1.8.12.2
retrieving revision 1.8.12.3
diff -C 2 -d -r1.8.12.2 -r1.8.12.3
*** CMakeLists.txt 21 Apr 2008 00:44:59 -0000 1.8.12.2
--- CMakeLists.txt 21 Apr 2009 21:18:47 -0000 1.8.12.3
***************
*** 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 CACHE BOOL "" FORCE)
! set(CPACK_BINARY_PACKAGEMAKER OFF CACHE BOOL "" FORCE )
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