revert inadvertently committed change

git-svn-id: http://svn.osgeo.org/qgis/trunk@12608 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 24, 2009 · 16bccbf · 16bccbf
1 parent bc5022f
commit 16bccbf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS  ${HELP_MOC_HDRS})
 
 #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 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
 ########################################################
 # 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")