Skip to content

Commit 16bccbf

Browse files
author
jef
committed
revert inadvertently committed change
git-svn-id: http://svn.osgeo.org/qgis/trunk@12608 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bc5022f commit 16bccbf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/helpviewer/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
5454

5555
#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
5656

57-
ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
57+
ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
5858

5959
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
6060
${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -97,8 +97,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
9797
########################################################
9898
# Install
9999

100-
IF (APPLE)
101-
INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
102-
ELSE (APPLE)
100+
IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
101+
INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
102+
ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
103103
INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
104-
ENDIF (APPLE)
104+
ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")

0 commit comments

Comments
 (0)