r19631 by craig - Move our plugins all to Frameworks bundle dir on OSX

[scribus-commit]

Author: craig
Date: Wed Nov 19 20:49:12 2014
New Revision: 19631

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19631
Log:
Move our plugins all to Frameworks bundle dir on OSX

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/scpaths.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19631&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Wed Nov 19 20:49:12 2014
@@ -181,7 +181,7 @@
 #Announce we cached a version request before, overridden below for OSX
 IF(TAG_VERSION)
   IF (NOT APPLEBUNDLE)
-    MESSAGE(STATUS "Previously selected version tag: ${TAG_VERSION}")
+	MESSAGE(STATUS "Previously selected version tag: ${TAG_VERSION}")
   ENDIF (NOT APPLEBUNDLE)
   SET(WANT_VERSIONING 1)
   SET(CACHED_VERSIONING 1)
@@ -209,6 +209,7 @@
 ########## Install/Directory Setup                                                                  ##########
 
 IF (APPLEBUNDLE)
+SET (APPLE_APP_DIR "${CMAKE_INSTALL_PREFIX}")
   IF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
     # all ok
   ELSE ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
@@ -221,7 +222,7 @@
     ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
   ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
 
-  MESSAGE(STATUS "APPLEBUNDLE install prefix: ${CMAKE_INSTALL_PREFIX}")
+  MESSAGE(STATUS "APPLEBUNDLE install prefix: ${APPLE_APP_DIR}")
 ENDIF (APPLEBUNDLE)
 
 
@@ -302,13 +303,17 @@
 #LIB LOCATION - lib or lib64 normally
 #LIB
 IF(WANT_LIB64)
-  IF(NOT ARCH_X86_64)
-    MESSAGE(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
-  ENDIF(NOT ARCH_X86_64)
-  SET(LIB_SUFFIX "64" CACHE TYPE STRING)
+	IF(NOT ARCH_X86_64)
+		MESSAGE(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
+	ENDIF(NOT ARCH_X86_64)
+	 SET(LIB_SUFFIX "64" CACHE TYPE STRING)
 ENDIF(WANT_LIB64)
 SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
-SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
+IF (APPLEBUNDLE)
+	SET(LIBDIR "Frameworks/")
+ELSE (APPLEBUNDLE)
+	SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ENDIF (APPLEBUNDLE)
 ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
 
 #C++11 Support
@@ -319,9 +324,13 @@
 
 #PLUGINS
 IF(WIN32)
-  SET(PLUGINDIR "plugins")
+	SET(PLUGINDIR "plugins")
 ELSE(WIN32)
-  SET(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
+	IF (APPLEBUNDLE)
+		SET(PLUGINDIR "${LIBDIR}")
+	ELSE (APPLEBUNDLE)
+		SET(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
+	ENDIF (APPLEBUNDLE)
 ENDIF(WIN32)
 ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"")
 

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19631&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Wed Nov 19 20:49:12 2014
@@ -72,8 +72,8 @@
 	m_sampleScriptDir = QString("%1/Contents/share/scribus/samples/").arg(pathPtr);
 	m_scriptDir = QString("%1/Contents/share/scribus/scripts/").arg(pathPtr);
 	m_templateDir = QString("%1/Contents/share/scribus/templates/").arg(pathPtr);
-	m_libDir = QString("%1/Contents/lib/scribus/").arg(pathPtr);
-	m_pluginDir = QString("%1/Contents/lib/scribus/plugins/").arg(pathPtr);
+	m_libDir = QString("%1/Contents/Frameworks/").arg(pathPtr);
+	m_pluginDir = QString("%1/Contents/Frameworks/").arg(pathPtr);
 	m_qmlDir = QString("%1/Contents/share/scribus/qml/").arg(pathPtr);
 	//QApplication::setLibraryPaths(QStringList(QString("%1/Contents/lib/qtplugins/").arg(pathPtr)));
 	QApplication::addLibraryPath(QString("%1/Contents/lib/qtplugins/").arg(pathPtr));