[QGIS Commit] r12608 - trunk/qgis/src/helpviewer

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-23 19:16:24 -0500 (Wed, 23 Dec 2009)
New Revision: 12608

Modified:
   trunk/qgis/src/helpviewer/CMakeLists.txt
Log:
revert inadvertently committed change

Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt	2009-12-23 22:55:10 UTC (rev 12607)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt	2009-12-24 00:16:24 UTC (rev 12608)
@@ -54,7 +54,7 @@
 
 #QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
 
-ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -97,8 +97,8 @@
 ########################################################
 # Install
 
-IF (APPLE)
-  INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
-ELSE (APPLE)
+IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+  INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
+ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
   INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
-ENDIF (APPLE)
+ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")