r15499 by craig - Update plugin linking code.. relates to #7210 and otehrs

scribus-commit scribus-commit at lists.scribus.net
Tue Oct 5 00:08:43 CEST 2010


Author: craig
Date: Mon Oct  4 22:08:43 2010
New Revision: 15499

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15499
Log:
Update plugin linking code.. relates to #7210 and otehrs

Modified:
    branches/Version135/Scribus/scribus/CMakeLists.txt

Modified: branches/Version135/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15499&path=/branches/Version135/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/scribus/CMakeLists.txt Mon Oct  4 22:08:43 2010
@@ -796,20 +796,25 @@
 ENDIF(HAVE_PODOFO)
 
 # Now build plugins
-SET(PLUGIN_LIBRARIES)
+SET(PLUGIN_LIBRARIES
+  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}
+  ${LIBXML2_LIBRARIES}
+  ${ZLIB_LIBRARIES}
+)
 IF(WIN32)
   # IF your plugin needs more than this, please link them privately
   # in the CMakeLists.txt for your plugin.
   SET(PLUGIN_LIBRARIES
 #    ${QT_LIBRARIES} part of #7210
-    ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}
-    ${LIBXML2_LIBRARIES}
-    ${ZLIB_LIBRARIES}
+    ${PLUGIN_LIBRARIES}
     ${EXE_NAME}
     )
 ENDIF(WIN32)
 IF(APPLE)
-  SET(PLUGIN_LIBRARIES "-undefined dynamic_lookup")
+  SET(PLUGIN_LIBRARIES
+    ${PLUGIN_LIBRARIES}
+    "-undefined dynamic_lookup"
+  )
 ENDIF(APPLE)
 
 ADD_SUBDIRECTORY(plugins)




More information about the scribus-commit mailing list