[QGIS Commit] r12753 - in trunk/qgis/src: core helpviewer

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-01-13 11:45:11 -0500 (Wed, 13 Jan 2010)
New Revision: 12753

Modified:
   trunk/qgis/src/core/qgsapplication.cpp
   trunk/qgis/src/helpviewer/CMakeLists.txt
   trunk/qgis/src/helpviewer/main.cpp
Log:
restore previous bundle build of helpviewer (r12622), add 2nd install step to correct install_name (fix #2294)

Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp	2010-01-12 22:49:21 UTC (rev 12752)
+++ trunk/qgis/src/core/qgsapplication.cpp	2010-01-13 16:45:11 UTC (rev 12753)
@@ -225,6 +225,9 @@
 const QString QgsApplication::helpAppPath()
 {
   QString helpAppPath = applicationDirPath();
+#ifdef Q_OS_MACX
+  helpAppPath += "/bin/qgis_help.app/Contents/MacOS";
+#endif
   helpAppPath += "/qgis_help";
   return helpAppPath;
 }

Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt	2010-01-12 22:49:21 UTC (rev 12752)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt	2010-01-13 16:45:11 UTC (rev 12753)
@@ -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
@@ -98,7 +98,8 @@
 # Install
 
 IF (APPLE)
-  INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+  INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
+  INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change @executable_path/lib/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")")
 ELSE (APPLE)
   INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
 ENDIF (APPLE)

Modified: trunk/qgis/src/helpviewer/main.cpp
===================================================================
--- trunk/qgis/src/helpviewer/main.cpp	2010-01-12 22:49:21 UTC (rev 12752)
+++ trunk/qgis/src/helpviewer/main.cpp	2010-01-13 16:45:11 UTC (rev 12753)
@@ -41,6 +41,10 @@
   {
     context = argv[1];
   }
+#ifdef Q_WS_MACX
+  // If we're on Mac, we have the resource library way above us...
+  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
+#endif
 
   QString i18nPath = QgsApplication::i18nPath();
   if ( myTranslationCode.isEmpty() )