r18465 by craig - Fix ps importer for Qt5

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 9 16:36:46 UTC 2013


Author: craig
Date: Mon Sep  9 16:36:45 2013
New Revision: 18465

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18465
Log:
Fix ps importer for Qt5

Modified:
    trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt

Modified: trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18465&path=/trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt Mon Sep  9 16:36:45 2013
@@ -1,52 +1,48 @@
 INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-${PODOFO_INCLUDES}
+	${CMAKE_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/scribus
+	${PODOFO_INCLUDES}
 )
 
 IF(HAVE_PODOFO)
-  INCLUDE_DIRECTORIES(
-    ${LIBPODOFO_INCLUDE_DIR}
-    )
+	INCLUDE_DIRECTORIES(
+		${LIBPODOFO_INCLUDE_DIR}
+	)
 ENDIF(HAVE_PODOFO)
 
 SET(IMPORTPS_PLUGIN_MOC_CLASSES
-  importps.h
-  importpsplugin.h
+	importps.h
+	importpsplugin.h
 )
 
 SET(IMPORTPS_PLUGIN_SOURCES
-  importps.cpp
-  importpsplugin.cpp
+	importps.cpp
+	importpsplugin.cpp
 )
 
 SET(SCRIBUS_IMPORTPS_PLUGIN "importps")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(IMPORTPS_PLUGIN_MOC_SOURCES ${IMPORTPS_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(IMPORTPS_PLUGIN_MOC_SOURCES ${IMPORTPS_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(IMPORTPS_PLUGIN_MOC_SOURCES ${IMPORTPS_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES} ${IMPORTPS_PLUGIN_MOC_SOURCES})
 
 TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN} ${PLUGIN_LIBRARIES})
 
 IF(HAVE_PODOFO)
-  TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN}
-    ${LIBPODOFO_LIBRARY}
-  )
+	TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN}
+		${LIBPODOFO_LIBRARY}
+	)
 ENDIF(HAVE_PODOFO)
 
 INSTALL(TARGETS ${SCRIBUS_IMPORTPS_PLUGIN}
-  LIBRARY
-  DESTINATION ${PLUGINDIR}
-  PERMISSIONS ${PLUGIN_PERMISSIONS}
+	LIBRARY
+	DESTINATION ${PLUGINDIR}
+	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
 INSTALL(FILES 
-import.prolog
-  DESTINATION ${LIBDIR}
+	import.prolog
+	DESTINATION ${LIBDIR}
 )
 
 ADD_DEPENDENCIES(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})




More information about the scribus-commit mailing list