[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.9 1.10 HelloWorldX11.cxx 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt HelloWorldX11.cxx 
Log Message:
ENH: add a simple x11 test for packaging


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/X11/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CMakeLists.txt	25 Mar 2008 15:27:18 -0000	1.9
--- CMakeLists.txt	11 Apr 2008 14:23:27 -0000	1.10
***************
*** 1,5 ****
  # a simple C only test case
  cmake_minimum_required (VERSION 2.6)
! PROJECT (UseX11 C)
  
  INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
--- 1,5 ----
  # a simple C only test case
  cmake_minimum_required (VERSION 2.6)
! PROJECT (UseX11 CXX C)
  
  INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
***************
*** 24,26 ****
--- 24,35 ----
    INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
    TARGET_LINK_LIBRARIES(UseX11 ${X11_LIBRARIES})
+   IF(APPLE)
+     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)

Index: HelloWorldX11.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/X11/HelloWorldX11.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** HelloWorldX11.cxx	11 Apr 2008 13:52:08 -0000	1.1
--- HelloWorldX11.cxx	11 Apr 2008 14:23:27 -0000	1.2
***************
*** 73,77 ****
  
    // event loop
!   while(TRUE) {     
    // get the next event and stuff it into our event variable.
    // Note:  only events we set the mask for are detected!
--- 73,77 ----
  
    // event loop
!   while(1) {     
    // get the next event and stuff it into our event variable.
    // Note:  only events we set the mask for are detected!