r24709 by jghali - #16640: ScZipHandler does not get linked into the executable
scribus-commit
scribus-commit at lists.scribus.net
Sun Sep 26 21:54:51 UTC 2021
Author: jghali
Date: Sun Sep 26 21:54:50 2021
New Revision: 24709
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24709
Log:
#16640: ScZipHandler does not get linked into the executable
Modified:
trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24709&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 Sun Sep 26 21:54:50 2021
@@ -11,7 +11,7 @@
add_library(${SCRIBUS_DOCX_IM_PLUGIN} MODULE ${DOCX_IM_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_DOCX_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_DOCX_LIB})
+target_link_libraries(${SCRIBUS_DOCX_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
if(WANT_PCH)
target_precompile_headers(${SCRIBUS_DOCX_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=24709&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 Sun Sep 26 21:54:50 2021
@@ -11,7 +11,7 @@
add_library(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${EXE_NAME})
+target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
if(WANT_PCH)
target_precompile_headers(${SCRIBUS_ODT_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=24709&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 Sun Sep 26 21:54:50 2021
@@ -14,7 +14,7 @@
add_library(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${EXE_NAME})
+target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
if(WANT_PCH)
target_precompile_headers(${SCRIBUS_SXW_IM_PLUGIN} PRIVATE "../../plugins_pch.h")
Modified: trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24709&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 Sun Sep 26 21:54:50 2021
@@ -15,7 +15,7 @@
add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
+target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
if(WANT_PCH)
target_precompile_headers(${SCRIBUS_IMPORTIDML_PLUGIN} PRIVATE "../../plugins_pch.h")
Modified: trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24709&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 Sun Sep 26 21:54:50 2021
@@ -12,7 +12,7 @@
add_library(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES})
-target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${EXE_NAME})
+target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${EXE_NAME} ${SCRIBUS_ZIP_LIB})
if(WANT_PCH)
target_precompile_headers(${SCRIBUS_OODRAW_FL_PLUGIN} PRIVATE "../../plugins_pch.h")
Modified: trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24709&path=/trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/zip/CMakeLists.txt Sun Sep 26 21:54:50 2021
@@ -13,9 +13,9 @@
scribus_zip.cpp
)
-set(SCRIBUS_ZIB_LIB "scribus_zip_lib")
-add_library(${SCRIBUS_ZIB_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES})
-set_target_properties(${SCRIBUS_ZIB_LIB}
+set(SCRIBUS_ZIP_LIB "scribus_zip_lib")
+add_library(${SCRIBUS_ZIP_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES})
+set_target_properties(${SCRIBUS_ZIP_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
More information about the scribus-commit
mailing list