r24704 by craig - #16617: CMake updates

Tue Aug 24 20:33:33 UTC 2021

Author: craig
Date: Tue Aug 24 20:33:33 2021
New Revision: 24704

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24704
Log:
#16617: CMake updates

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/resources/translations/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/pluginapi.h
    trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
    trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
    trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
    trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
    trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
    trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
    trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
    trunk/Scribus/scribus/scribusapi.h
    trunk/Scribus/scribus/styles/stylecontextproxy.h
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/CMakeLists.txt
==============================================================================

--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -340,7 +340,9 @@
 	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE)
 endif()
 
-
+set(CMAKE_ENABLE_EXPORTS ON)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
 #Based on our build type, setup our build options
 if(APPLE)
@@ -354,19 +356,15 @@
 		set(CMAKE_C_FLAGS_DEBUG)
 	else()
 		# vanilla gcc
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing -Wl,-E")
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing -Wl,-E")
-		if (_machine_x86 OR _machine_x86_64)
-			set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
-			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fPIC")
-		endif()
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing")
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall -fstrict-aliasing")
 	endif()
 	if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
 		set(CMAKE_CXX_FLAGS_RELEASE)
 		set(CMAKE_C_FLAGS_RELEASE)
 	else()
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -Wall -fPIC -Wl,-E")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall -fPIC -Wl,-E")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -Wall")
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall")
 	#	add_definitions(-DNDEBUG)
 	endif()
 endif()
@@ -398,6 +396,7 @@
 		set(CMAKE_CXX_STANDARD 17)
 endif()
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set (CMAKE_CXX_EXTENSIONS OFF)
 
 ##############################################################################################################
 ########## Find Dependencies                                                                        ##########

Modified: trunk/Scribus/resources/translations/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/resources/translations/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/translations/CMakeLists.txt	(original)
+++ trunk/Scribus/resources/translations/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -18,6 +18,8 @@
 
 message(STATUS "The following GUI languages will be installed: ${WANT_GUI_LANG}")
 
+set(QM_FILES)
+
 #If the user specified WANT_GUI_LANG, then we only create build/install targets for those languages
 if(WANT_GUI_LANG)
   foreach(TS_FILEPATH ${SCRIBUS_TS_FILES})
@@ -28,11 +30,13 @@
 	  if(LANGSTR STREQUAL WANTED_LANG)
 		#message(STATUS "You want to install ${LANGSTR}:${WANTED_LANG}")
 		set(QM_FILENAME "scribus.${LANGSTR}.qm")
-		add_custom_target("release_ts_${LANGSTR}" ALL
-		  COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
-		  DEPENDS ${TS_FILEPATH}
+		add_custom_command(
+      OUTPUT ${QM_FILENAME}
+			COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
+      MAIN_DEPENDENCY ${TS_FILEPATH}
+      COMMENT "release_ts_${LANGSTR}"
 		)
-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
+    list(APPEND QM_FILES "${QM_FILENAME}")
 	  endif(LANGSTR STREQUAL WANTED_LANG)
 	endforeach(WANTED_LANG)
   endforeach(TS_FILEPATH)
@@ -43,11 +47,21 @@
 	string(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
 	string(REPLACE "." ""  LANGSTR ${LANGSTR})
 	set(QM_FILENAME "scribus.${LANGSTR}.qm")
-	add_custom_target("release_ts_${LANGSTR}" ALL
-	  COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
-	  DEPENDS ${TS_FILEPATH}
-	)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
+  add_custom_command(
+    OUTPUT ${QM_FILENAME}
+    COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
+    MAIN_DEPENDENCY ${TS_FILEPATH}
+    COMMENT "release_ts_${LANGSTR}"
+  )
+  list(APPEND QM_FILES "${QM_FILENAME}")
   endforeach(TS_FILEPATH)
 endif(WANT_GUI_LANG)
 
+add_custom_target(Translations ALL
+  DEPENDS ${QM_FILES}
+  )
+foreach(QM_FILE IN LISTS QM_FILES)
+		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILE}" DESTINATION ${SHAREDIR}/translations)
+endforeach(QM_FILE)
+
+unset(QM_FILES)

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -679,7 +679,7 @@
 endif()
 
 if(HAVE_HYPHEN)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 	${HYPHEN_LIBRARY}
 	)
 endif()
@@ -754,40 +754,32 @@
 	set(WIN32_ONLY_LIBS)
 endif()
 
-##TEST FIX FOR 6897
-# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
-# binary are in the public symbol table for plugins. The symbols must also
-# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
-# Should fix bug 6897 .
-if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-	set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-endif ()
-if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND NOT WIN32)
-	set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-endif ()
 ##
 
 
 #Set up libraries to link with all found packages
 include_directories(${cairo_INCLUDE_DIR})
-target_link_libraries(${EXE_NAME} ${cairo_LIBRARIES})
+target_link_libraries(${EXE_NAME} PRIVATE ${cairo_LIBRARIES})
 link_directories(${PREFIX_cairo_LIB})
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${PREFIX_cairo_LIB}")
 
 message("RPATH: ${CMAKE_INSTALL_RPATH}")
 
 IF(NOT WANT_QT6)
-    target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME}
+		PUBLIC
 		${Qt5Core_LIBRARIES}
 		${Qt5Widgets_LIBRARIES}
 		${Qt5Gui_LIBRARIES}
 		${Qt5Xml_LIBRARIES}
 		${Qt5Network_LIBRARIES}
 		${Qt5OpenGL_LIBRARIES}
+		PRIVATE
 		${Qt5PrintSupport_LIBRARIES}
 	)
 else()
 	target_link_libraries(${EXE_NAME}
+		PUBLIC
 		Qt6::Core
 		Qt6::Core5Compat
 		Qt6::Gui
@@ -797,23 +789,25 @@
 endif()
 
 target_link_libraries(${EXE_NAME}
+	PUBLIC
+	${ZLIB_LIBRARIES}
+	${LIBXML2_LIBRARIES}
+	PRIVATE
 	${CUPS_LIBRARIES}
 	${FREETYPE_LIBRARIES}
 	${HARFBUZZ_LIBRARIES}
 	${HARFBUZZ_SUBSET_LIBRARIES}
 	${ICU_LIBRARIES}
-	${LIBXML2_LIBRARIES}
 	${TIFF_LIBRARIES}
 	${PNG_LIBRARIES}
 	${JPEG_LIBRARIES}
-	${ZLIB_LIBRARIES}
 	${WIN32_ONLY_LIBS}
 	${GMAGICK_LIBRARIES}
 )
 
 
 if (TARGET Fontconfig::Fontconfig)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		Fontconfig::Fontconfig
 	)
 endif()
@@ -821,7 +815,7 @@
 
 
 if (NOT WIN32 AND NOT HAIKU)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		${CUPS_LIBRARIES}
 	)
 endif ()
@@ -829,33 +823,36 @@
 # required to resolve symbols from libdl when ld is called with --no-add-needed
 # #9310 for the OpenBSD addition
 if(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
-	target_link_libraries(${EXE_NAME} dl)
+  target_link_libraries(${EXE_NAME} PUBLIC ${CMAKE_DL_LIBS})
 endif()
 
 # #9311 for the OpenBSD addition
 if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-	target_link_libraries(${EXE_NAME} util execinfo)
+  target_link_libraries(${EXE_NAME} PRIVATE util execinfo)
 endif()
 
 if(HAIKU)
-	target_link_libraries(${EXE_NAME} execinfo)
+  target_link_libraries(${EXE_NAME} PRIVATE execinfo)
 endif(HAIKU)
 
 if(WIN32)
-	target_link_libraries(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
+  target_link_libraries(${EXE_NAME} PRIVATE ${QT_QTMAIN_LIBRARY})
 endif()
 
 if(APPLE)
 	target_link_libraries(${EXE_NAME}
-	"-undefined dynamic_lookup"
-	"-framework CoreFoundation" )
+		PUBLIC
+		"-undefined dynamic_lookup"
+		PRIVATE
+		"-framework CoreFoundation"
+		)
 endif()
 
 if (WANT_SVNVERSION)
 	add_dependencies(${EXE_NAME} svnheader)
 endif ()
 
-target_link_libraries(${EXE_NAME}
+target_link_libraries(${EXE_NAME} PRIVATE
 	${SCRIBUS_WPG_LIB}
 	${SCRIBUS_PGF_LIB}
 	${SCRIBUS_ZIP_LIB}
@@ -864,20 +861,20 @@
 )
 
 if(WITH_TESTS)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		${QT_QTTEST_LIBRARY}
 		${SCRIBUS_TESTS_LIB}
 	)
 endif()
 
 if(HAVE_PODOFO)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		${LIBPODOFO_LIBRARY}
 	)
 endif()
 
 if(HAVE_OSG)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		${OPENTHREADS_LIBRARY}
 		${OSG_LIBRARY}
 		${OSGGA_LIBRARY}
@@ -890,51 +887,17 @@
 endif()
 
 if (HAVE_BOOST)
-	target_link_libraries(${EXE_NAME}
+	target_link_libraries(${EXE_NAME} PRIVATE
 		${SCRIBUS_2GEOM_LIB}
 	)
 endif()
 
 # Now build plugins
-IF(NOT WANT_QT6)
-    set(PLUGIN_LIBRARIES
-		${Qt5Core_LIBRARIES}
-		${Qt5Widgets_LIBRARIES}
-		${Qt5Gui_LIBRARIES}
-		${Qt5Xml_LIBRARIES}
-		${Qt5Network_LIBRARIES}
-		${Qt5OpenGL_LIBRARIES}
-		${LIBXML2_LIBRARIES}
-		${ZLIB_LIBRARIES}
-	)
-else()
-	set(PLUGIN_LIBRARIES
-		${Qt6Core_LIBRARIES}
-		${Qt6Core5Compat_LIBRARIES}
-		${Qt6Widgets_LIBRARIES}
-		${Qt6Gui_LIBRARIES}
-		${LIBXML2_LIBRARIES}
-		${ZLIB_LIBRARIES}
-	)
-endif()
-
-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
-		${PLUGIN_LIBRARIES}
-		${EXE_NAME}
-	)
-endif()
-if(APPLE)
-	set(PLUGIN_LIBRARIES
-		${PLUGIN_LIBRARIES}
-		"-undefined dynamic_lookup"
-	)
-endif()
-message(STATUS ${PLUGIN_LIBRARIES})
-
+
+# IF your plugin needs additional libraries, please link them privately
+# in the CMakeLists.txt for your plugin.
+
+add_custom_target(Plugins ALL)
 add_subdirectory(plugins)
 
 #do we want a lib suffix on osx? doubt it

Modified: trunk/Scribus/scribus/pluginapi.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/pluginapi.h
==============================================================================
--- trunk/Scribus/scribus/pluginapi.h	(original)
+++ trunk/Scribus/scribus/pluginapi.h	Tue Aug 24 20:33:33 2021
@@ -25,13 +25,8 @@
         #endif
     #endif
 #else
-    #ifdef HAVE_GCC_SYMBOL_VISIBILITY
-        #define PLUGIN_API __attribute__ ((visibility("default")))
-        #define PLUGIN_LOCAL __attribute__ ((visibility("hidden")))
-    #else
-        #define PLUGIN_API
-        #define PLUGIN_LOCAL
-    #endif
+    #define PLUGIN_API __attribute__ ((visibility("default")))
+    #define PLUGIN_LOCAL __attribute__ ((visibility("hidden")))
 #endif
 
 #endif

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -30,6 +30,6 @@
 	DESTINATION ${SHAREDIR}/plugins
 )
 
-add_dependencies(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_BARCODEGENERATOR_PLUGIN})
 
 # set_target_properties(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_COLORWHEEL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_COLORWHEEL_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_COLORWHEEL_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -26,6 +26,6 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_COLORWHEEL_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_COLORWHEEL_PLUGIN})
 
 # set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PIXMAPEXPORT_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,6 +25,6 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_PIXMAPEXPORT_PLUGIN})
 
 # set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_EXPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_EXPORTSVG_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_EXPORTSVG_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -24,6 +24,6 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_EXPORTSVG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_EXPORTSVG_PLUGIN})
 
 # set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,7 +15,7 @@
 
 add_library(${SCRIBUS_EXPORTXPS_PLUGIN} MODULE ${EXPORTXPS_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_EXPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+target_link_libraries(${SCRIBUS_EXPORTXPS_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_EXPORTXPS_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -27,4 +27,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_EXPORTXPS_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_EXPORTXPS_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -18,7 +18,7 @@
 	target_precompile_headers(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} PRIVATE "../../plugins_pch.h")
 endif()
 
-target_link_libraries(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} ${EXE_NAME})
 
 install(TARGETS ${SCRIBUS_SCR134FORMAT_FL_PLUGIN}
 	LIBRARY

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,7 +15,7 @@
 
 add_library(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_FONTPREVIEW_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_FONTPREVIEW_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_FONTPREVIEW_PLUGIN} PRIVATE "../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_CSV_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_CSV_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_CSV_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_DOC_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_DOC_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_DOC_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_DOCX_IM_PLUGIN} MODULE ${DOCX_IM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_DOCX_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_DOCX_LIB})
+target_link_libraries(${SCRIBUS_DOCX_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_DOCX_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_DOCX_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_HTML_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/markdownim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -18,7 +18,7 @@
 
 	add_library(${SCRIBUS_MARKDOWN_IM_PLUGIN} MODULE ${MARKDOWN_IM_PLUGIN_SOURCES})
 
-	target_link_libraries(${SCRIBUS_MARKDOWN_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_MARKDOWN_LIB})
+	target_link_libraries(${SCRIBUS_MARKDOWN_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_MARKDOWN_LIB})
 
 	if(WANT_PCH)
 		target_precompile_headers(${SCRIBUS_MARKDOWN_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_ODT_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_PDB_GT_PLUGIN} MODULE ${PDB_GT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PDB_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PDB_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PDB_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_RTF_IM_PLUGIN} MODULE ${RTF_IM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_RTF_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_RTF_LIB})
+target_link_libraries(${SCRIBUS_RTF_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_RTF_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_RTF_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -14,7 +14,7 @@
 
 add_library(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SXW_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_TEXTFILTER_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TEXTFILTER_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_TEXTFILTER_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 link_libraries (${LIBXML2_LIBRARIES})
 
-target_link_libraries(${SCRIBUS_TXT_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TXT_GT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_TXT_GT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_XTG_IM_PLUGIN} MODULE ${XTG_IM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_XTG_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_XTG_IM_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_XTG_IM_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -22,13 +22,13 @@
 
 if(WIN32)
 	target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN}
-		${PLUGIN_LIBRARIES}
+		${EXE_NAME}
 		${TIFF_LIBRARIES}
 		${PNG_LIBRARIES}
 		${JPEG_LIBRARIES}
 	)
 else()
-	target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN} ${PLUGIN_LIBRARIES})
+	target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN} ${EXE_NAME})
 endif()
 
 if(HAVE_PODOFO)
@@ -47,4 +47,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTAI_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTAI_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,12 +16,12 @@
 		set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
 
 		add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTCDR_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTCDR_PLUGIN})
 	endif ()
 else ()
 	pkg_check_modules(LIBWPG libwpg-0.2)
@@ -45,12 +45,12 @@
 					set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
 
 					add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES})
-					target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
+					target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTCDR_PLUGIN} PRIVATE "../../plugins_pch.h")
 					endif()
 					install(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-					add_dependencies(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
+					add_dependencies(Plugins ${SCRIBUS_IMPORTCDR_PLUGIN})
 				endif ()
 			endif ()
 		endif ()

Modified: trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTCGM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTCGM_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTCGM_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTCGM_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTCGM_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTCVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTCVG_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTCVG_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,5 +25,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTCVG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTCVG_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTDRW_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTDRW_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTDRW_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,5 +25,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTDRW_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTDRW_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTEMF_PLUGIN} MODULE ${IMPORTEMF_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTEMF_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTEMF_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTEMF_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTEMF_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTEMF_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,11 +16,11 @@
 		set(SCRIBUS_IMPORTFH_PLUGIN "importfh")
 
 		add_library(${SCRIBUS_IMPORTFH_PLUGIN} MODULE ${IMPORTFH_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTFH_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTFH_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTFH_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTFH_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTFH_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTFH_PLUGIN})
 	endif ()
 endif ()

Modified: trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,7 +15,7 @@
 
 add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTIDML_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -27,4 +27,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTIDML_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -21,7 +21,7 @@
 
 add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTIDML_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -33,6 +33,6 @@
   PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTIDML_PLUGIN})
 
 # set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,7 +15,7 @@
 add_library(${SCRIBUS_IMPORTODG_PLUGIN} MODULE ${IMPORTODG_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
-target_link_libraries(${SCRIBUS_IMPORTODG_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+target_link_libraries(${SCRIBUS_IMPORTODG_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTODG_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -27,5 +27,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTODG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTODG_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_OODRAW_FL_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -9,9 +9,9 @@
 #		set(IMPORTPAGES_PLUGIN "importpages")
 
 #		add_library(${IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
-#		target_link_libraries(${IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
+#		target_link_libraries(${IMPORTPAGES_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
 #		install(TARGETS ${IMPORTPAGES_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-#		add_dependencies(${IMPORTPAGES_PLUGIN} ${EXE_NAME})
+#		add_dependencies(Plugins ${IMPORTPAGES_PLUGIN})
 #	endif ()
 #endif ()
 
@@ -32,7 +32,7 @@
 add_library(${SCRIBUS_IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
-target_link_libraries(${SCRIBUS_IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+target_link_libraries(${SCRIBUS_IMPORTPAGES_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTPAGES_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -44,5 +44,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTPAGES_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTPAGES_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTPCT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTPCT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTPCT_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTPCT_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTPCT_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -26,7 +26,7 @@
 add_library(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
-target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${poppler_LIBRARY})
+target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${EXE_NAME} ${poppler_LIBRARY})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTPDF_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -38,4 +38,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTPDF_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTPDF_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,11 +16,11 @@
 		set(SCRIBUS_IMPORTPM_PLUGIN "importpm")
 
 		add_library(${SCRIBUS_IMPORTPM_PLUGIN} MODULE ${IMPORTPM_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTPM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTPM_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTPM_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTPM_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTPM_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTPM_PLUGIN})
 	endif ()
 endif ()

Modified: trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&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	Tue Aug 24 20:33:33 2021
@@ -19,7 +19,7 @@
 
 add_library(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTPS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTPS_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -42,4 +42,4 @@
 	DESTINATION ${LIBDIR}
 )
 
-add_dependencies(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTPS_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,12 +16,12 @@
 		set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
 
 		add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTPUB_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTPUB_PLUGIN})
 	endif ()
 else ()
 	pkg_check_modules(LIBMSPUB libmspub-0.0<=0.1)
@@ -46,12 +46,12 @@
 					set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
 
 					add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES})
-					target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
+					target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTPUB_PLUGIN} PRIVATE "../../plugins_pch.h")
 					endif()
 					install(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-					add_dependencies(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
+					add_dependencies(Plugins ${SCRIBUS_IMPORTPUB_PLUGIN})
 				endif ()
 			endif ()
 		endif ()

Modified: trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,11 +16,11 @@
 		set(SCRIBUS_IMPORTQXP_PLUGIN "importqxp")
 
 		add_library(${SCRIBUS_IMPORTQXP_PLUGIN} MODULE ${IMPORTQXP_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTQXP_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBQXP_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTQXP_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBQXP_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTQXP_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTQXP_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTQXP_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTQXP_PLUGIN})
 	endif ()
 endif ()

Modified: trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTSHAPE_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTSHAPE_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTSML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSML_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTSML_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTSML_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTSML_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSVG_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTSVG_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -24,4 +24,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTSVG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTSVG_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTSVM_PLUGIN} MODULE ${IMPORTSVM_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTSVM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSVM_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTSVM_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTSVM_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTSVM_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -23,5 +23,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,7 +15,7 @@
 
 add_library(${SCRIBUS_IMPORTVIVA_PLUGIN} MODULE ${IMPORTVIVA_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTVIVA_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTVIVA_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTVIVA_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -27,4 +27,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTVIVA_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTVIVA_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,12 +16,12 @@
 		set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
 
 		add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTVSD_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTVSD_PLUGIN})
 	endif ()
 else ()
 	pkg_check_modules(LIBWPG libwpg-0.2)
@@ -45,12 +45,12 @@
 					set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
 
 					add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES})
-					target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
+					target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
 					if(WANT_PCH)
 						target_precompile_headers(${SCRIBUS_IMPORTVSD_PLUGIN} PRIVATE "../../plugins_pch.h")
 					endif()
 					install(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-					add_dependencies(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
+					add_dependencies(Plugins ${SCRIBUS_IMPORTVSD_PLUGIN})
 				endif ()
 			endif ()
 		endif ()

Modified: trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTWMF_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTWMF_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTWMF_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 set(SCRIBUS_IMPORTWPG_PLUGIN "importwpg")
 
 add_library(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_IMPORTWPG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTWPG_PLUGIN} ${EXE_NAME})
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTWPG_PLUGIN} PRIVATE "../../plugins_pch.h")
 endif()
@@ -21,4 +21,4 @@
 	DESTINATION ${PLUGINDIR}
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
-add_dependencies(${SCRIBUS_IMPORTWPG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTWPG_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTXAR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTXAR_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTXAR_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTXAR_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTXAR_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_IMPORTXFIG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTXFIG_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTXFIG_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -25,4 +25,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTXFIG_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTXFIG_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,7 +16,7 @@
 add_library(${SCRIBUS_IMPORTXPS_PLUGIN} MODULE ${IMPORTXPS_PLUGIN_SOURCES})
 
 link_directories( /usr/local/lib )
-target_link_libraries(${SCRIBUS_IMPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+target_link_libraries(${SCRIBUS_IMPORTXPS_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTXPS_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -28,6 +28,6 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_IMPORTXPS_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_IMPORTXPS_PLUGIN})
 
 # set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -15,11 +15,11 @@
 		set(IMPORTZMF_PLUGIN_SOURCES ../revenge/rawpainter.cpp importzmf.cpp importzmfplugin.cpp)
 		set(SCRIBUS_IMPORTZMF_PLUGIN "importzmf")
 		add_library(${SCRIBUS_IMPORTZMF_PLUGIN} MODULE ${IMPORTZMF_PLUGIN_SOURCES} ${IMPORTZMF_PLUGIN_MOC_SOURCES})
-		target_link_libraries(${SCRIBUS_IMPORTZMF_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBZMF_LDFLAGS})
+		target_link_libraries(${SCRIBUS_IMPORTZMF_PLUGIN} ${EXE_NAME} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBZMF_LDFLAGS})
 		if(WANT_PCH)
 			target_precompile_headers(${SCRIBUS_IMPORTZMF_PLUGIN} PRIVATE "../../plugins_pch.h")
 		endif()
 		install(TARGETS ${SCRIBUS_IMPORTZMF_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-		add_dependencies(${SCRIBUS_IMPORTZMF_PLUGIN} ${EXE_NAME})
+		add_dependencies(Plugins ${SCRIBUS_IMPORTZMF_PLUGIN})
 	endif ()
 endif ()

Modified: trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -19,7 +19,7 @@
 
 add_library(${SCRIBUS_MY_PLUGIN} MODULE ${MY_PLUGIN_SOURCES} ${MY_PLUGIN_MOC_SOURCES})
 
-target_link_libraries(${SCRIBUS_MY_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_MY_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_MY_PLUGIN} PRIVATE "../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -21,7 +21,7 @@
 
 add_library(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PICTUREBROWSER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PICTUREBROWSER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PICTUREBROWSER_PLUGIN} PRIVATE "../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} PRIVATE "../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -33,7 +33,7 @@
   ${PYTHON_LIBRARIES}
 )
 
-target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCRIPTER_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -65,4 +65,4 @@
   DESTINATION ${PLUGINDIR}/scripter/sceditor
 )
 
-add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_SCRIPTER_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -51,7 +51,7 @@
 	${SCRIBUS_API_LIB}
 )
 
-target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCRIPTER_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -63,4 +63,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_SCRIPTER_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -51,7 +51,7 @@
 	${SCRIBUS_API_LIB}
 )
 
-target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SCRIPTER_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -63,4 +63,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_SCRIPTER_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -16,7 +16,7 @@
 	${SHAPE_PLUGIN_SOURCES}
 )
 
-target_link_libraries(${SCRIBUS_SHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SHAPE_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SHAPE_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -28,5 +28,5 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_SHAPE_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_SHAPE_PLUGIN})
 

Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -19,7 +19,7 @@
 	${SHORTWORDS_PLUGIN_SOURCES}
 )
 
-target_link_libraries(${SCRIBUS_SHORTWORDS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SHORTWORDS_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SHORTWORDS_PLUGIN} PRIVATE "../plugins_pch.h")
@@ -35,4 +35,4 @@
   DESTINATION ${SHAREDIR}/plugins
 )
 
-add_dependencies(${SCRIBUS_SHORTWORDS_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_SHORTWORDS_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_MESHDISTORTION_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
+target_link_libraries(${SCRIBUS_MESHDISTORTION_PLUGIN} ${EXE_NAME} ${SCRIBUS_2GEOM_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_MESHDISTORTION_PLUGIN} PRIVATE "../../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PATHALONGPATH_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
+target_link_libraries(${SCRIBUS_PATHALONGPATH_PLUGIN} ${EXE_NAME} ${SCRIBUS_2GEOM_LIB})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PATHALONGPATH_PLUGIN} PRIVATE "../../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_FLATTENPATH_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_FLATTENPATH_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_FLATTENPATH_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -18,7 +18,7 @@
 	${HUNSPELL_PLUGIN_SOURCES}
 )
 
-target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${hunspell_LIBRARIES} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${hunspell_LIBRARIES} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_HUNSPELL_PLUGIN} PRIVATE "../../plugins_pch.h")
@@ -30,4 +30,4 @@
 	PERMISSIONS ${PLUGIN_PERMISSIONS}
 )
 
-add_dependencies(${SCRIBUS_HUNSPELL_PLUGIN} ${EXE_NAME})
+add_dependencies(Plugins ${SCRIBUS_HUNSPELL_PLUGIN})

Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_LENSEFFECTS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_LENSEFFECTS_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_LENSEFFECTS_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -12,7 +12,7 @@
 
 add_library(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PATHCONNECT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHCONNECT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PATHCONNECT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -18,7 +18,7 @@
 
 add_library(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PATHCUT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHCUT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PATHCUT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -22,7 +22,7 @@
 
 add_library(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PATHFINDER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHFINDER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PATHFINDER_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_PATHSTROKER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHSTROKER_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_PATHSTROKER_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SMOOTHPATH_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SMOOTHPATH_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SMOOTHPATH_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -11,7 +11,7 @@
 
 add_library(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_SUBDIVIDE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SUBDIVIDE_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_SUBDIVIDE_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt	Tue Aug 24 20:33:33 2021
@@ -13,7 +13,7 @@
 
 add_library(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} MODULE ${TRANSFORMEFFECT_PLUGIN_SOURCES})
 
-target_link_libraries(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} ${EXE_NAME})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} PRIVATE "../../plugins_pch.h")

Modified: trunk/Scribus/scribus/scribusapi.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/scribusapi.h
==============================================================================
--- trunk/Scribus/scribus/scribusapi.h	(original)
+++ trunk/Scribus/scribus/scribusapi.h	Tue Aug 24 20:33:33 2021
@@ -52,26 +52,19 @@
         #endif
     #endif
 #else
-    #ifdef HAVE_GCC_SYMBOL_VISIBILITY
-        /* Forces inclusion of a symbol in the symbol table, so
-           software outside the current library / app can use it. */
-        #define SCRIBUS_API __attribute__ ((visibility("default")))
-        /* Within a section exported with SCRIBUS_API, forces a symbol to be
-           private to the library / app. Good for private members. */
-        #define SCRIBUS_LOCAL __attribute__ ((visibility("hidden")))
-    #else
-        #define SCRIBUS_API
-        #define SCRIBUS_LOCAL
-    #endif
+    /* Forces inclusion of a symbol in the symbol table, so
+       software outside the current library / app can use it. */
+    #define SCRIBUS_API __attribute__ ((visibility("default")))
+    /* Within a section exported with SCRIBUS_API, forces a symbol to be
+       private to the library / app. Good for private members. */
+    #define SCRIBUS_LOCAL __attribute__ ((visibility("hidden")))
 #endif
 
 /* Throwable classes must always be visible on GCC in all binaries */
 #ifdef WIN32
   #define SCEXCEPTIONAPI(api) api
-#elif defined(HAVE_GCC_SYMBOL_VISIBILITY)
+#else
   #define SCEXCEPTIONAPI(api) SCRIBUS_API
-#else
-  #define SCEXCEPTIONAPI(api)
 #endif
 
 #endif

Modified: trunk/Scribus/scribus/styles/stylecontextproxy.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/styles/stylecontextproxy.h
==============================================================================
--- trunk/Scribus/scribus/styles/stylecontextproxy.h	(original)
+++ trunk/Scribus/scribus/styles/stylecontextproxy.h	Tue Aug 24 20:33:33 2021
@@ -30,7 +30,7 @@
 *  it maps the empty name "" to the given default style and uses
 *  the style's context to resolve all other names.
 */
-class StyleContextProxy: public StyleContext 
+class SCRIBUS_API StyleContextProxy: public StyleContext 
 {
 public:
 	const BaseStyle* resolve(const QString& name) const;

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24704&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Tue Aug 24 20:33:33 2021
@@ -127,8 +127,8 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "18";
-	QString BUILD_MONTH = CommonStrings::july;
+	QString BUILD_DAY = "24";
+	QString BUILD_MONTH = CommonStrings::august;
 	QString BUILD_YEAR = "2021";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";


