Cmake: Fixed the extra -l in the link command, plus a add linking for all sub-libs...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5b2622af3698b2f44a887add4d71821c99d9739..1b8053a02a69f32d3de9f522616b5c1fe82b7341 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,17 +5,17 @@ SET(PROJECT_NAME inkscape)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+IF(COMMAND cmake_policy)
+  CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND cmake_policy)
 
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
-INCLUDE(ConfigPaths)
-INCLUDE(DefineDependsandFlags)
-INCLUDE(HelperMacros)
 
-# Set to true if compiler/linker should enable profiling:
-#SET(ENABLE_PROFILING TRUE)
+INCLUDE(ConfigPaths) #Installation Paths
+INCLUDE(DefineDependsandFlags) #Includes, Compiler Flags, and Link Libraries
+INCLUDE(HelperMacros) #Misc Utility Macros
+
+OPTION(ENABLE_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling
 
 #make dist target
 SET(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 749c3c534bd2b9ea48e3cf0640f3dc3b0337a331..d2086876723a69c6e50f9ae496a929de5cd5525b 100644 (file)
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -1,7 +1,7 @@
 #---------------\r
 # From here on:\r
 # Set all HAVE_XXX variables, to correctly set all defines in config.h\r
-SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES})\r
+#SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES})\r
 INCLUDE (CheckIncludeFiles)\r
 INCLUDE (CheckFunctionExists)\r
 INCLUDE (CheckStructMember)\r
@@ -55,9 +55,9 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)\r
 CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)\r
 CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)\r
-CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)
+CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)\r
 \r
-#Enable pango defines, necessary for compilation on Win32, how about Linux?
+#Enable pango defines, necessary for compilation on Win32, how about Linux?\r
 # yes but needs to be done a better way\r
 IF (HAVE_CAIRO_PDF)\r
     SET(PANGO_ENABLE_ENGINE TRUE)\r
@@ -67,5 +67,5 @@ ENDIF(HAVE_CAIRO_PDF)
 # Create the two configuration files: config.h and inkscape_version.h\r
 # Create them in the binary root dir\r
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)\r
-FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")
-add_definitions(-DHAVE_CONFIG_H)
+FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")\r
+add_definitions(-DHAVE_CONFIG_H)\r

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d4971416e61278e3893711d1f97820cd396993a5..89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -19,20 +19,20 @@ INCLUDE(IncludeJava)
 # end Dependencies
 
 #Linking 
-LIST(APPEND INKSCAPE_LIBS 
-${GTK2_LIBRARIES}
-${SIGC++_LIBRARIES}
-${GSL_LIBRARIES}
-${XML2_LIBRARIES}
-${XSLT_LIBRARIES}
-${IMAGEMAGICK++_LIBRARIES}
-${FREETYPE2_LIBRARIES}
-${GNOMEVFS2_LIBRARIES}
-${BOOST_LIBRARIES}
-${BOEHMGC_LIBRARIES}
-${PNG_LIBRARIES}
-${POPT_LIBRARIES}
-${OPENSSL_LIBRARIES}
+LIST(APPEND INKSCAPE_LIBS
+# ${GTK2_LIBRARIES}
+# ${SIGC++_LIBRARIES}
+# ${GSL_LIBRARIES}
+# ${XML2_LIBRARIES}
+# ${XSLT_LIBRARIES}
+# ${IMAGEMAGICK++_LIBRARIES}
+# ${FREETYPE2_LIBRARIES}
+# ${GNOMEVFS2_LIBRARIES}
+# ${BOOST_LIBRARIES}
+# ${BOEHMGC_LIBRARIES}
+# ${PNG_LIBRARIES}
+# ${POPT_LIBRARIES}
+# ${OPENSSL_LIBRARIES}
 )
 
 #Includes 

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index e75c6174b520d68a71e892f42c29d162ee2656bf..b5461487dd659dcaf0b32c866bf6b3019646f704 100644 (file)
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -121,6 +121,6 @@ numeric/matrix.cpp
 )
 
 # make lib for 2geom
-ADD_LIBRARY(2geom ${LIB_TYPE} ${2GEOM_SRC})
+ADD_LIBRARY(2geom STATIC ${2GEOM_SRC})
 #TARGET_LINK_LIBRARIES(2geom blas gsl)
-TARGET_LINK_LIBRARIES(2geom "${LINK_GSL} ${GTK2_LINK_FLAGS}")
+TARGET_LINK_LIBRARIES(2geom ${INKSCAPE_LIBS})

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f7cc33dc0a89797892e5bc33af0eb265da0e25d..32c1f241b8251c9e22b59cb7d0332db4a3031208 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -251,18 +251,19 @@ ENDFOREACH(srclistsrc)
 \r
 SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})\r
 \r
-#message(status "${INKSCAPE_LIBS}")\r
 ADD_LIBRARY(sp STATIC ${SP_SRC})\r
-\r
+TARGET_LINK_LIBRARIES(sp\r
+nr nrtype avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}\r
+)\r
 # make executable for INKSCAPE\r
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
 TARGET_LINK_LIBRARIES(inkscape\r
-    ${internalfolders} sp avoid cola croco gdl nr nrtype vpsc livarot ${INKSCAPE_LIBS}\r
+nr nrtype sp avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}\r
 )\r
 \r
 # make executable for INKVIEW\r
 #ADD_EXECUTABLE(inkview inkview.cpp)\r
 #TARGET_LINK_LIBRARIES(inkview\r
-#      "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}\r
+#      2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}\r
 #)\r
 \r

diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index aa1a039113230889c2fbbff593971ea5baf4d6b1..c09279395439bffffebc67a30fe03bee8865e7bf 100644 (file)
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -3,4 +3,6 @@ editor.cpp
 application.cpp
 app-prototype.cpp
 )
-ADD_LIBRARY(application STATIC ${application_SRC})
\ No newline at end of file
+ADD_LIBRARY(application STATIC ${application_SRC})
+TARGET_LINK_LIBRARIES(application
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt
index 0708c3eff71918f8e02ee1d707070b4b618947bb..a6b5b6883da70a0ab2b495464ee7d74ca18b7ba3 100644 (file)
--- a/src/bind/CMakeLists.txt
+++ b/src/bind/CMakeLists.txt
@@ -2,4 +2,6 @@ SET(bind_SRC
 dobinding.cpp
 javabind.cpp
 )
-ADD_LIBRARY(bind STATIC ${bind_SRC})
\ No newline at end of file
+ADD_LIBRARY(bind STATIC ${bind_SRC})
+TARGET_LINK_LIBRARIES(bind
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt
index 27088acf9446f574863cd8807aca3f11891a127e..26c4e6934fc9a1b724234fdbf302bab9d56cd901 100644 (file)
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -7,4 +7,6 @@ sysv-heap.cpp
 timestamp.cpp
 gdk-event-latency-tracker.cpp
 )
-ADD_LIBRARY(debug STATIC ${debug_SRC})
\ No newline at end of file
+ADD_LIBRARY(debug STATIC ${debug_SRC})
+TARGET_LINK_LIBRARIES(debug
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index d5007b13d070df475ac935c2d1b193c5a951edba..9d2ed9eb87740cee77445b8184dfdc66f9fc96bc 100644 (file)
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -23,4 +23,6 @@ text-edit.cpp
 unclump.cpp
 xml-tree.cpp
 )
-ADD_LIBRARY(dialogs STATIC ${dialogs_SRC})
\ No newline at end of file
+ADD_LIBRARY(dialogs STATIC ${dialogs_SRC})
+TARGET_LINK_LIBRARIES(dialogs
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index 66fa97462ba4a230e409859eeafec71cd7f0441c..9fa2304bec544ae0714bf372574d62bc68d66cfd 100644 (file)
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -54,4 +54,6 @@ sp-ctrlline.cpp
 sp-ctrlquadr.cpp
 #testnr.cpp
 )
-ADD_LIBRARY(display STATIC ${display_SRC})
\ No newline at end of file
+ADD_LIBRARY(display STATIC ${display_SRC})
+TARGET_LINK_LIBRARIES(display
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 8a85390aa2a77299499c03402ff04b84910a33a8..7c434eb7790bb4f381f391f444504cd4b9ae6152 100644 (file)
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -33,4 +33,6 @@ ${dom_odf_SRC}
 ${dom_util_SRC}
 #${dom_work_SRC}
 )
-ADD_LIBRARY(dom STATIC ${dom_SRC})
\ No newline at end of file
+ADD_LIBRARY(dom STATIC ${dom_SRC})
+TARGET_LINK_LIBRARIES(dom
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index d712eb61fdf94370b3867662361b090a44bedfbf..cd640d3d0739bf5d25e1f3bf46b4a7d70e4ba3c5 100644 (file)
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -36,4 +36,6 @@ ${extension_internal_pdfinput_SRC}
 ${extension_param_SRC}
 ${extension_script_SRC}
 )
-ADD_LIBRARY(extension STATIC ${extension_SRC})
\ No newline at end of file
+ADD_LIBRARY(extension STATIC ${extension_SRC})
+TARGET_LINK_LIBRARIES(extension
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt
index e9baa6f88a6901b0682edc0347e552eda2b68ada..554402d353c1b5e19f37e3f89e6effbae1afd285 100644 (file)
--- a/src/filters/CMakeLists.txt
+++ b/src/filters/CMakeLists.txt
@@ -21,3 +21,5 @@ tile.cpp
 turbulence.cpp
 )
 ADD_LIBRARY(filters STATIC ${filters_SRC})
+TARGET_LINK_LIBRARIES(filters
+2geom ${INKSCAPE_LIBS})

diff --git a/src/graphlayout/CMakeLists.txt b/src/graphlayout/CMakeLists.txt
index 4ad15eb43886266885086f96c518c4040b9e2a92..c8847a2284d15b08db08fef885633bba27fa987c 100644 (file)
--- a/src/graphlayout/CMakeLists.txt
+++ b/src/graphlayout/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(graphlayout_SRC
 graphlayout.cpp
 )
-ADD_LIBRARY(graphlayout STATIC ${graphlayout_SRC})
\ No newline at end of file
+ADD_LIBRARY(graphlayout STATIC ${graphlayout_SRC})
+TARGET_LINK_LIBRARIES(graphlayout
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index fe817919936cb1e9dd363f468c307067c2b893aa..8f42a0d5a6ccf7bea92f7c4f3048b720141b4c4c 100644 (file)
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -24,4 +24,6 @@ sp-marshal.list
 ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
 )
-ADD_LIBRARY(helper STATIC ${helper_SRC})
\ No newline at end of file
+ADD_LIBRARY(helper STATIC ${helper_SRC})
+TARGET_LINK_LIBRARIES(helper
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/inkjar/CMakeLists.txt b/src/inkjar/CMakeLists.txt
index 2d4f52ca36d9239059ec152bc8a1f0e8afe76c39..7a1e86525b6e8eaf57529fa86908b45981c6f4ae 100644 (file)
--- a/src/inkjar/CMakeLists.txt
+++ b/src/inkjar/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(inkjar_SRC
 jar.cpp
 )
-ADD_LIBRARY(inkjar STATIC ${inkjar_SRC})
\ No newline at end of file
+ADD_LIBRARY(inkjar STATIC ${inkjar_SRC})
+TARGET_LINK_LIBRARIES(inkjar
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 8db1b518c80203583cfd0116e15463afba43bb74..13b8f568b73e561e05a1edcf33ba22fc5379db8c 100644 (file)
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -11,4 +11,6 @@ sys.cpp
 uristream.cpp
 xsltstream.cpp
 )
-ADD_LIBRARY(io STATIC ${io_SRC})
\ No newline at end of file
+ADD_LIBRARY(io STATIC ${io_SRC})
+TARGET_LINK_LIBRARIES(io
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
index f428c84c621a002950bb50ddb4dd7f9927351686..5f4dfa9810cd9ed7e62db0ed43b0ecfe029b8b0f 100644 (file)
--- a/src/jabber_whiteboard/CMakeLists.txt
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -18,4 +18,6 @@ session-file-selector.cpp
 session-manager.cpp
 ${jabber_whiteboard_dialog_SRC}
 )
-ADD_LIBRARY(jabber_whiteboard STATIC ${jabber_whiteboard_SRC})
\ No newline at end of file
+ADD_LIBRARY(jabber_whiteboard STATIC ${jabber_whiteboard_SRC})
+TARGET_LINK_LIBRARIES(jabber_whiteboard
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index db24527f1f1df52a95edf18d34c7335d7ef461d6..df532c5644da63485ce2bc7bdf206027905ce4f7 100644 (file)
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -13,3 +13,5 @@ vertices.cpp
 visibility.cpp
 )
 ADD_LIBRARY(avoid STATIC ${libavoid_SRC})
+TARGET_LINK_LIBRARIES(avoid
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index 564663aa02b5162e208a7d5fed87baa784c4ea82..b5f2e7f1f9460f9e5338e864ff8cb6c2fd2b80be 100644 (file)
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -8,3 +8,5 @@ shortest_paths.cpp
 straightener.cpp
 )
 ADD_LIBRARY(cola STATIC ${libcola_SRC})
+TARGET_LINK_LIBRARIES(cola
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt
index cee248a2a4a076a534585eefc52135716bd16c59..3ca55b4b55fe66840aab2a8879a6d34c37936376 100644 (file)
--- a/src/libcroco/CMakeLists.txt
+++ b/src/libcroco/CMakeLists.txt
@@ -26,5 +26,7 @@ cr-term.c
 cr-tknzr.c
 cr-token.c
 cr-utils.c
-)\r
+)
 ADD_LIBRARY(croco STATIC ${libcroco_SRC})
+TARGET_LINK_LIBRARIES(croco
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index 0c12944a54cbcc0ec7739d36a6975a75646a0e0e..dea93e6bc552f991c2768b658382c0fc636231be 100644 (file)
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -18,8 +18,11 @@ gdl-dock-tablabel.c
 gdl-i18n.c
 gdl-stock.c
 gdl-switcher.c
-gdl-tools.h\rlibgdlmarshal.c
+gdl-tools.h
+libgdlmarshal.c
 libgdltypebuiltins.c
 ${GDL_WIN}
 )
 ADD_LIBRARY(gdl STATIC ${libgdl_SRC})
+TARGET_LINK_LIBRARIES(gdl
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index d29b83da81c27bbb9c3bed319eeb470b49c91f5e..3bf483181893885dd8d255523c290da21ef6a8a1 100644 (file)
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -33,4 +33,4 @@ testnr.cpp
 )
 ADD_LIBRARY(nr STATIC ${libnr_SRC})
 TARGET_LINK_LIBRARIES(nr
-       "${INKSCAPE_LINK_FLAGS}" 2geom )
+2geom ${INKSCAPE_LIBS})

diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 28ff101c9f5dee47dcced457db82b6810053c02b..61ecb009149a5f1af17f1b0a82f239eb6808c0d7 100644 (file)
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -16,4 +16,4 @@ TextWrapper.cpp
 )
 ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
 TARGET_LINK_LIBRARIES(nrtype
-       "${INKSCAPE_LINK_FLAGS}" nr )
+nr ${INKSCAPE_LIBS})

diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
index 23b6f84cd3efbdcdf60531f5488b9a096b0998ce..4c3398b0f217c80be05c2d69276f93ff38a97454 100644 (file)
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/libvpsc/CMakeLists.txt
@@ -1,11 +1,13 @@
 SET(libvpsc_SRC\r
-block.cpp
-blocks.cpp
-constraint.cpp
-csolve_VPSC.cpp
-generate-constraints.cpp
-remove_rectangle_overlap.cpp
-solve_VPSC.cpp
+block.cpp\r
+blocks.cpp\r
+constraint.cpp\r
+csolve_VPSC.cpp\r
+generate-constraints.cpp\r
+remove_rectangle_overlap.cpp\r
+solve_VPSC.cpp\r
 variable.cpp\r
 )\r
-ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})
+ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})\r
+TARGET_LINK_LIBRARIES(vpsc\r
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
index d12df1c3b2287c587505be3dac920b75e7f742fb..6eaf84d1c7aa69705c81bffd774487727f86cf30 100644 (file)
--- a/src/livarot/CMakeLists.txt
+++ b/src/livarot/CMakeLists.txt
@@ -21,3 +21,5 @@ sweep-tree.cpp
 sweep-tree-list.cpp
 )
 ADD_LIBRARY(livarot STATIC ${livarot_SRC})
+TARGET_LINK_LIBRARIES(nrtype
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 80a982bc3c0338abdb3d05bb694ac0e6733066b9..adf172247793aa341d55994a58c3f35f3e203d3a 100644 (file)
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -31,4 +31,6 @@ lpe-dynastroke.cpp
 spiro.cpp
 ${live_effects_parameter_SRC}
 )
-ADD_LIBRARY(live_effects STATIC ${live_effects_SRC})
\ No newline at end of file
+ADD_LIBRARY(live_effects STATIC ${live_effects_SRC})
+TARGET_LINK_LIBRARIES(live_effects
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt
index 207afd451d0b2306d4cb8d517a68b69f0e21ed3f..cb9a01b2ff39c02ba2b3d3e4996feac70d9f5093 100644 (file)
--- a/src/pedro/CMakeLists.txt
+++ b/src/pedro/CMakeLists.txt
@@ -8,4 +8,6 @@ pedrodom.cpp
 pedroutil.cpp
 pedroxmpp.cpp
 )
-ADD_LIBRARY(pedro STATIC ${pedro_SRC})
\ No newline at end of file
+ADD_LIBRARY(pedro STATIC ${pedro_SRC})
+TARGET_LINK_LIBRARIES(pedro
+${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/removeoverlap/CMakeLists.txt b/src/removeoverlap/CMakeLists.txt
index abb01eb55b4e50d675ba91031b86dcd4ddbbbcfe..7f71c29dc6242834cdea5d2f8dbe1abd7015ca01 100644 (file)
--- a/src/removeoverlap/CMakeLists.txt
+++ b/src/removeoverlap/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(removeoverlap_SRC
 removeoverlap.cpp
 )
-ADD_LIBRARY(removeoverlap STATIC ${removeoverlap_SRC})
\ No newline at end of file
+ADD_LIBRARY(removeoverlap STATIC ${removeoverlap_SRC})
+TARGET_LINK_LIBRARIES(removeoverlap
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index f015646b8298f71cdca73165e20a1db72d988b9d..9d5dc0b7bad53df6046403dcecc39e91c0b16464 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -13,4 +13,6 @@ svg-length.cpp
 svg-path.cpp
 #test-stubs.cpp
 )
-ADD_LIBRARY(svg STATIC ${svg_SRC})
\ No newline at end of file
+ADD_LIBRARY(svg STATIC ${svg_SRC})
+TARGET_LINK_LIBRARIES(svg
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 0eb445dee57affed0389be4492e8cc2abf35551a..3cb378995dbcbfb424402e9ee67a9550064435a2 100644 (file)
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -8,4 +8,6 @@ siox.cpp
 trace.cpp
 ${trace_potrace_SRC}
 )
-ADD_LIBRARY(trace STATIC ${trace_SRC})
\ No newline at end of file
+ADD_LIBRARY(trace STATIC ${trace_SRC})
+TARGET_LINK_LIBRARIES(trace
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index f788a04bf85ad9d6172bc12f6fdbc59cc300e443..01dadb7c297d92ab45a638bf726a85546207a037 100644 (file)
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -19,4 +19,6 @@ ${ui_dialog_SRC}
 ${ui_view_SRC}
 ${ui_widget_SRC}
 )
-ADD_LIBRARY(ui STATIC ${ui_SRC})
\ No newline at end of file
+ADD_LIBRARY(ui STATIC ${ui_SRC})
+TARGET_LINK_LIBRARIES(ui
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 5e193a8f23237c24a7d2035d2da880ff07edf2df..18237ac750e798d6fa824e821fb61a593867d05d 100644 (file)
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -2,4 +2,6 @@ SET(util_SRC
 share.cpp
 units.cpp
 )
-ADD_LIBRARY(util STATIC ${util_SRC})
\ No newline at end of file
+ADD_LIBRARY(util STATIC ${util_SRC})
+TARGET_LINK_LIBRARIES(util
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 24c1d30d29f9e7543f54e5a473af31cbfb0d0e52..45f013f16da40d8ec2e6d9d4bbb9b1138e54c1d0 100644 (file)
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -31,4 +31,6 @@ sp-xmlview-content.cpp
 sp-xmlview-tree.cpp
 toolbox.cpp
 )
-ADD_LIBRARY(widgets STATIC ${widgets_SRC})
\ No newline at end of file
+ADD_LIBRARY(widgets STATIC ${widgets_SRC})
+TARGET_LINK_LIBRARIES(widgets
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 4036cb1afa56382067df01d736b46748e26a09cb..775a4e72ffd4d7f177f6f039e1f5c450d3944c63 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -16,4 +16,6 @@ simple-document.cpp
 simple-node.cpp
 subtree.cpp
 )
-ADD_LIBRARY(xml STATIC ${xml_SRC})
\ No newline at end of file
+ADD_LIBRARY(xml STATIC ${xml_SRC})
+TARGET_LINK_LIBRARIES(xml
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file