r18763 by craig - Add missing QML changes

[scribus-commit]

Author: craig
Date: Mon Jan 20 18:34:59 2014
New Revision: 18763

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18763
Log:
Add missing QML changes

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18763&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon Jan 20 18:34:59 2014
@@ -227,7 +227,7 @@
 ENDIF (WIN32 OR OS2)
 ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
 
-#ICON
+#ICONS
 IF(WIN32)
   SET(ICONDIR "share/icons/")
 ELSE(WIN32)
@@ -250,6 +250,10 @@
   SET(TEMPLATEDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/templates/")
 ENDIF(WIN32)
 ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"")
+
+#QML
+SET(QMLDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/qml/")
+ADD_DEFINITIONS("-DQMLDIR=\\\"${CMAKE_INSTALL_PREFIX}/${QMLDIR}\\\"")
 
 #DESKTOP
 SET(DESKTOPDIR "share/applications/")
@@ -278,6 +282,12 @@
 SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
 ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
 
+#C++11 Support
+IF(WANT_CPP11)
+	MESSAGE(STATUS "Enabling C++11 compiler features")
+	ADD_DEFINITIONS("-std=c++11")
+ENDIF(WANT_CPP11)
+
 #PLUGINS
 IF(WIN32)
   SET(PLUGINDIR "plugins")
@@ -285,6 +295,7 @@
   SET(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
 ENDIF(WIN32)
 ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"")
+
 
 #INCLUDE
 SET(INCLUDEDIR "include/${MAIN_DIR_NAME}${TAG_VERSION}/")
@@ -808,6 +819,15 @@
     README.MacOSX
     DESTINATION ${DOCDIR}
   )
+
+#	EXECUTE_PROCESS (COMMAND mkdir -p "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats")
+#	IF (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+#MESSAGE(STATUS ${QT_PREFIX})
+#MESSAGE(STATUS "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib")
+#MESSAGE(STATUS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+#		EXECUTE_PROCESS (COMMAND ditto "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib" "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+#	ENDIF()
+
 ENDIF (APPLE)
 
 #Install our MIME data