[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.17 1.18

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Apr 8 11:30:51 EDT 2008


Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv12351

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: make sure cmake-gui builds with cmake 2.4.X


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** CMakeLists.txt	4 Apr 2008 20:02:50 -0000	1.17
--- CMakeLists.txt	8 Apr 2008 15:30:47 -0000	1.18
***************
*** 56,65 ****
  
    ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
-   IF(APPLE)
-     SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
-      OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
-   ENDIF(APPLE)
    TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
    IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
      SET(CMAKE_INSTALL_DESTINATION_ARGS 
        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
--- 56,65 ----
  
    ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
    TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
    IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+     IF(APPLE)
+       SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
+        OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+     ENDIF(APPLE)
      SET(CMAKE_INSTALL_DESTINATION_ARGS 
        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")



More information about the Cmake-commits mailing list