diff options
49 files changed, 325 insertions, 416 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ec7cf201..5fb5438ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ + project(inkscape) set(INKSCAPE_VERSION 0.48+devel) @@ -13,6 +14,11 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts") # XXX, TODO: use pkgconfig, This part is WIP to get building # - campbell + +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -fPIC -funsigned-char -fno-strict-aliasing -pthread") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fPIC -funsigned-char -fno-strict-aliasing -pthread") + + include_directories( /usr/include/freetype2 /usr/include/gnome-vfs-2.0 diff --git a/cxxtest/CMakeLists.txt b/cxxtest/CMakeLists.txt index 437759e00..d049fccbb 100644 --- a/cxxtest/CMakeLists.txt +++ b/cxxtest/CMakeLists.txt @@ -1,3 +1,4 @@ + set(cxxtest_SRC #add stuff here ) diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt index bdb24cc59..6c6001c4b 100644 --- a/src/2geom/CMakeLists.txt +++ b/src/2geom/CMakeLists.txt @@ -122,6 +122,4 @@ set(2geom_SRC ) # make lib for 2geom_LIB -add_library(2geom_LIB STATIC ${2geom_SRC}) -#TARGET_LINK_LIBRARIES(2geom_LIB blas_LIB gsl_LIB) -target_link_libraries(2geom_LIB ${INKSCAPE_LIBS}) +add_library(2geom_LIB ${2geom_SRC}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fa5a5b34e..de6175134 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ -set(SP_SRC
+set(sp_SRC
sp-anchor.cpp
# sp-animation.cpp
sp-clippath.cpp
@@ -69,7 +69,7 @@ set(SP_SRC splivarot.cpp
)
-set(INKSCAPE_SRC
+set(inkscape_SRC
arc-context.cpp
attributes.cpp
axis-manip.cpp
@@ -205,7 +205,7 @@ set(INKSCAPE_SRC )
if(WIN32)
- list(APPEND INKSCAPE_SRC
+ list(APPEND inkscape_SRC
registrytool.cpp
#deptool.cpp
winmain.cpp
@@ -259,55 +259,47 @@ foreach(srclistsrc ${dirs}) add_subdirectory(${srclistsrc})
endforeach()
-set(INKSCAPE_SRC
- ${INKSCAPE_SRC}
+set(inkscape_SRC
+ ${inkscape_SRC}
${GlibOutput}
)
-add_library(sp_LIB STATIC ${SP_SRC})
+add_library(sp_LIB ${sp_SRC})
-target_link_libraries(
- sp_LIB
- nr_LIB
- nrtype_LIB
- avoid_LIB
- cola_LIB
+# make executable for INKSCAPE
+add_executable(inkscape ${inkscape_SRC})
+
+target_link_libraries(inkscape
+ # order from automake
+ dom_LIB
croco_LIB
+ avoid_LIB
gdl_LIB
+ cola_LIB
vpsc_LIB
livarot_LIB
+ 2geom_LIB
+ # guessing these ones
+ ui_LIB
bind_LIB
+ debug_LIB
+ dialogs_LIB
display_LIB
- dom_LIB
extension_LIB
filters_LIB
helper_LIB
io_LIB
- live_effects_LIB
+ nr_LIB
+ nrtype_LIB
+ sp_LIB
svg_LIB
trace_LIB
- ui_LIB
+ util_LIB
widgets_LIB
xml_LIB
- 2geom_LIB
-
- ${INKSCAPE_LIBS}
-)
-
-# make executable for INKSCAPE
-add_executable(inkscape ${INKSCAPE_SRC})
+ live_effects_LIB
-target_link_libraries(inkscape
- nr_LIB
- nrtype_LIB
- sp_LIB
- avoid_LIB
- cola_LIB
- croco_LIB
- gdl_LIB
- vpsc_LIB
- livarot_LIB
${INKSCAPE_LIBS}
diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index 71bf0b602..d0f7c7ca0 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,6 +1,7 @@ + set(bind_SRC dobinding.cpp javabind.cpp ) -add_library(bind_LIB STATIC ${bind_SRC}) -target_link_libraries(bind_LIB ${INKSCAPE_LIBS}) + +add_library(bind_LIB ${bind_SRC}) diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 6727817f9..0c5760366 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -9,5 +9,4 @@ set(debug_SRC gdk-event-latency-tracker.cpp ) -add_library(debug_LIB STATIC ${debug_SRC}) -target_link_libraries(debug_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(debug_LIB ${debug_SRC}) diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt index d22b5750c..bd6942ca6 100644 --- a/src/dialogs/CMakeLists.txt +++ b/src/dialogs/CMakeLists.txt @@ -1,3 +1,4 @@ + set(dialogs_SRC clonetiler.cpp dialog-events.cpp @@ -9,5 +10,5 @@ set(dialogs_SRC text-edit.cpp xml-tree.cpp ) -add_library(dialogs_LIB STATIC ${dialogs_SRC}) -target_link_libraries(dialogs_LIB 2geom_LIB ${INKSCAPE_LIBS}) + +add_library(dialogs_LIB ${dialogs_SRC}) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 86f122297..ff0b7eac1 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -1,3 +1,4 @@ + set(display_SRC canvas-arena.cpp canvas-axonomgrid.cpp @@ -62,5 +63,4 @@ include_directories( "${CMAKE_SOURCE_DIR}/src" ) -add_library(display_LIB STATIC ${display_SRC}) -target_link_libraries(display_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(display_LIB ${display_SRC}) diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt index 66571d06a..5a3ebebf8 100644 --- a/src/dom/CMakeLists.txt +++ b/src/dom/CMakeLists.txt @@ -1,13 +1,3 @@ -set(domfolders - io - odf - util - #work -) - -foreach(domlistsrc ${domfolders}) - add_subdirectory(${domlistsrc}) -endforeach() set(dom_SRC cssreader.cpp @@ -28,11 +18,35 @@ set(dom_SRC xpathimpl.cpp xpathparser.cpp xpathtoken.cpp - ${dom_io_SRC} - ${dom_odf_SRC} - ${dom_util_SRC} - #${dom_work_SRC} + + io/base64stream.cpp + io/bufferstream.cpp + io/domstream.cpp + io/gzipstream.cpp + # io/httpclient.cpp + io/socket.cpp + io/stringstream.cpp + io/uristream.cpp + + odf/odfdocument.cpp + #odf/SvgOdg.cpp + + util/digest.cpp + util/thread.cpp + util/ziptool.cpp + + # # Dont use any of them. + # work/svg2.cpp + # work/testdom.cpp + # work/testhttp.cpp + # work/testjs.cpp + # work/testodf.cpp + # work/testsvg.cpp + # work/testuri.cpp + # work/testxpath.cpp + # work/testzip.cpp + # work/xpathtests.cpp + ) -add_library(dom_LIB STATIC ${dom_SRC}) -target_link_libraries(dom_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(dom_LIB ${dom_SRC}) diff --git a/src/dom/io/CMakeLists.txt b/src/dom/io/CMakeLists.txt deleted file mode 100644 index 7b99c898f..000000000 --- a/src/dom/io/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(dom_io_SRC - base64stream.cpp - bufferstream.cpp - domstream.cpp - gzipstream.cpp - # httpclient.cpp - socket.cpp - stringstream.cpp - uristream.cpp -) - diff --git a/src/dom/odf/CMakeLists.txt b/src/dom/odf/CMakeLists.txt deleted file mode 100644 index 089f65fbf..000000000 --- a/src/dom/odf/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(dom_odf_SRC - odfdocument.cpp - #SvgOdg.cpp -) - diff --git a/src/dom/util/CMakeLists.txt b/src/dom/util/CMakeLists.txt deleted file mode 100644 index e5f583fa5..000000000 --- a/src/dom/util/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(dom_util_SRC - digest.cpp - thread.cpp - ziptool.cpp -) - diff --git a/src/dom/work/CMakeLists.txt b/src/dom/work/CMakeLists.txt deleted file mode 100644 index 52552c8b9..000000000 --- a/src/dom/work/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(dom_work_SRC - #testdom.cpp - #testhttp.cpp - #testjs.cpp - #testodf.cpp - #testsvg.cpp - #testuri.cpp - #testxpath.cpp - #testzip.cpp - #xpathtests.cpp -) - diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 47cfbe9e4..3d8777e3a 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -1,17 +1,3 @@ -set(extfolders - #dxf2svg - implementation - internal - internal/bitmap - internal/filter - internal/pdfinput - param - script -) - -foreach(extlistsrc ${extfolders}) - add_subdirectory(${extlistsrc}) -endforeach() set(extension_SRC db.cpp @@ -28,14 +14,105 @@ set(extension_SRC print.cpp system.cpp timer.cpp - #${extension_dxf2svg_SRC} - ${extension_implementation_SRC} - ${extension_internal_bitmap_SRC} - ${extension_internal_filter_SRC} - ${extension_internal_pdfinput_SRC} - ${extension_param_SRC} - ${extension_script_SRC} + + implementation/implementation.cpp + implementation/xslt.cpp + implementation/script.cpp + + param/bool.cpp + param/color.cpp + param/description.cpp + param/enum.cpp + param/float.cpp + param/int.cpp + param/notebook.cpp + param/parameter.cpp + param/radiobutton.cpp + param/string.cpp + + internal/bluredge.cpp + internal/cairo-png-out.cpp + internal/cairo-ps-out.cpp + # internal/cairo-render-context.cpp # XXX MUST GET THIS WORKING + # internal/cairo-renderer.cpp # XXX MUST GET THIS WORKING + internal/cairo-renderer-pdf-out.cpp + internal/emf-win32-inout.cpp + internal/emf-win32-print.cpp + internal/gdkpixbuf-input.cpp + internal/gimpgrad.cpp + internal/grid.cpp + internal/latex-pstricks.cpp + # internal/latex-pstricks-out.cpp # XXX MUST GET THIS WORKING + internal/odf.cpp + internal/latex-text-renderer.cpp + internal/pdf-input-cairo.cpp + internal/pov-out.cpp + internal/javafx-out.cpp + internal/svg.cpp + internal/svgz.cpp + internal/wpg-input.cpp + + internal/bitmap/adaptiveThreshold.cpp + internal/bitmap/addNoise.cpp + internal/bitmap/blur.cpp + internal/bitmap/channel.cpp + internal/bitmap/charcoal.cpp + internal/bitmap/colorize.cpp + internal/bitmap/contrast.cpp + internal/bitmap/cycleColormap.cpp + internal/bitmap/despeckle.cpp + internal/bitmap/edge.cpp + internal/bitmap/emboss.cpp + internal/bitmap/enhance.cpp + internal/bitmap/equalize.cpp + internal/bitmap/gaussianBlur.cpp + internal/bitmap/imagemagick.cpp + internal/bitmap/implode.cpp + internal/bitmap/level.cpp + internal/bitmap/levelChannel.cpp + internal/bitmap/medianFilter.cpp + internal/bitmap/modulate.cpp + internal/bitmap/negate.cpp + internal/bitmap/normalize.cpp + internal/bitmap/oilPaint.cpp + internal/bitmap/opacity.cpp + internal/bitmap/raise.cpp + internal/bitmap/reduceNoise.cpp + internal/bitmap/sample.cpp + internal/bitmap/shade.cpp + internal/bitmap/sharpen.cpp + internal/bitmap/solarize.cpp + internal/bitmap/spread.cpp + internal/bitmap/swirl.cpp + internal/bitmap/threshold.cpp + internal/bitmap/unsharpmask.cpp + internal/bitmap/wave.cpp + + internal/filter/filter-all.cpp + internal/filter/filter-file.cpp + internal/filter/filter.cpp + + internal/pdfinput/pdf-input.cpp + internal/pdfinput/pdf-parser.cpp + internal/pdfinput/svg-builder.cpp + + script/InkscapeScript.cpp + + # dxf2svg/aci2rgb.cpp + # dxf2svg/entities2elements.cpp + # dxf2svg/tables2svg_info.cpp + # dxf2svg/blocks.cpp + # dxf2svg/entities.cpp + # dxf2svg/tables.cpp + # dxf2svg/dxf2svg.cpp + # dxf2svg/read_dxf.cpp + # dxf2svg/test_dxf.cpp ) -add_library(extension_LIB STATIC ${extension_SRC}) -target_link_libraries(extension_LIB 2geom_LIB ${INKSCAPE_LIBS}) +if(WIN32) + list(APPEND extension_SRC + win32.cpp + ) +endif() + +add_library(extension_LIB ${extension_SRC}) diff --git a/src/extension/dxf2svg/CMakeLists.txt b/src/extension/dxf2svg/CMakeLists.txt deleted file mode 100644 index 0ff0eaec0..000000000 --- a/src/extension/dxf2svg/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(extension_dxf2svg_SRC - #aci2rgb.cpp - #entities2elements.cpp - #tables2svg_info.cpp - #blocks.cpp - #entities.cpp - #tables.cpp - #dxf2svg.cpp - #read_dxf.cpp - #test_dxf.cpp -) diff --git a/src/extension/implementation/CMakeLists.txt b/src/extension/implementation/CMakeLists.txt deleted file mode 100644 index dcdf092c2..000000000 --- a/src/extension/implementation/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(extension_implementation_SRC - implementation.cpp - xslt.cpp - script.cpp -) diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt deleted file mode 100644 index d13ec9f74..000000000 --- a/src/extension/internal/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -set(extension_internal_SRC - bluredge.cpp - cairo-png-out.cpp - cairo-ps-out.cpp - cairo-render-context.cpp - cairo-renderer.cpp - cairo-renderer-pdf-out.cpp - emf-win32-inout.cpp - emf-win32-print.cpp - gdkpixbuf-input.cpp - gimpgrad.cpp - grid.cpp - latex-pstricks.cpp - latex-pstricks-out.cpp - odf.cpp - latex-text-renderer.cpp - pdf-input-cairo.cpp - pov-out.cpp - javafx-out.cpp - svg.cpp - svgz.cpp - wpg-input.cpp -) - -if(WIN32) - list(APPEND extension_internal_SRC - win32.cpp - ) -endif() diff --git a/src/extension/internal/bitmap/CMakeLists.txt b/src/extension/internal/bitmap/CMakeLists.txt deleted file mode 100644 index a273804ba..000000000 --- a/src/extension/internal/bitmap/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -set(extension_internal_bitmap_SRC - adaptiveThreshold.cpp - addNoise.cpp - blur.cpp - channel.cpp - charcoal.cpp - colorize.cpp - contrast.cpp - cycleColormap.cpp - despeckle.cpp - edge.cpp - emboss.cpp - enhance.cpp - equalize.cpp - gaussianBlur.cpp - imagemagick.cpp - implode.cpp - levelChannel.cpp - level.cpp - medianFilter.cpp - modulate.cpp - negate.cpp - normalize.cpp - oilPaint.cpp - opacity.cpp - raise.cpp - reduceNoise.cpp - sample.cpp - shade.cpp - sharpen.cpp - solarize.cpp - spread.cpp - swirl.cpp - threshold.cpp - unsharpmask.cpp - wave.cpp -) diff --git a/src/extension/internal/filter/CMakeLists.txt b/src/extension/internal/filter/CMakeLists.txt deleted file mode 100644 index 349504f94..000000000 --- a/src/extension/internal/filter/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -set(extension_internal_filter_SRC - drop-shadow.h - filter-all.cpp - filter.cpp - filter-file.cpp - filter.h - snow.h -) diff --git a/src/extension/internal/pdfinput/CMakeLists.txt b/src/extension/internal/pdfinput/CMakeLists.txt deleted file mode 100644 index fe31c2a7f..000000000 --- a/src/extension/internal/pdfinput/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(extension_internal_pdfinput_SRC - pdf-input.cpp - pdf-parser.cpp - svg-builder.cpp -) diff --git a/src/extension/param/CMakeLists.txt b/src/extension/param/CMakeLists.txt deleted file mode 100644 index b2981308e..000000000 --- a/src/extension/param/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(extension_param_SRC - bool.cpp - color.cpp - description.cpp - enum.cpp - float.cpp - int.cpp - notebook.cpp - parameter.cpp - radiobutton.cpp - string.cpp -) - diff --git a/src/extension/script/CMakeLists.txt b/src/extension/script/CMakeLists.txt deleted file mode 100644 index 88977164e..000000000 --- a/src/extension/script/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -set(extension_script_SRC - InkscapeScript.cpp -) diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index a1bec4642..ed64fe764 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -1,3 +1,4 @@ + set(filters_SRC blend.cpp colormatrix.cpp @@ -20,5 +21,5 @@ set(filters_SRC tile.cpp turbulence.cpp ) -add_library(filters_LIB STATIC ${filters_SRC}) -target_link_libraries(filters_LIB 2geom_LIB ${INKSCAPE_LIBS}) + +add_library(filters_LIB ${filters_SRC}) diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 86c5eea10..3f1567cce 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,3 +1,4 @@ + include(UseGlibMarshal) GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") @@ -26,5 +27,4 @@ set(helper_SRC ${sp_marshal_SRC} ) -add_library(helper_LIB STATIC ${helper_SRC}) -target_link_libraries(helper_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(helper_LIB ${helper_SRC}) diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt index 88040744b..06a5f869a 100644 --- a/src/io/CMakeLists.txt +++ b/src/io/CMakeLists.txt @@ -1,3 +1,4 @@ + set(io_SRC base64stream.cpp ftos.cpp @@ -12,5 +13,4 @@ set(io_SRC xsltstream.cpp ) -add_library(io_LIB STATIC ${io_SRC}) -target_link_libraries(io_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(io_LIB ${io_SRC}) diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt index dbe9f1e1e..2e1ef311b 100644 --- a/src/jabber_whiteboard/CMakeLists.txt +++ b/src/jabber_whiteboard/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(dialog) set(jabber_whiteboard_SRC defines.cpp @@ -16,8 +15,8 @@ set(jabber_whiteboard_SRC pedrogui.cpp session-file-selector.cpp session-manager.cpp - ${jabber_whiteboard_dialog_SRC} + + dialog/choose-desktop.cpp ) -add_library(jabber_whiteboard_LIB STATIC ${jabber_whiteboard_SRC}) -target_link_libraries(jabber_whiteboard_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(jabber_whiteboard_LIB ${jabber_whiteboard_SRC}) diff --git a/src/jabber_whiteboard/dialog/CMakeLists.txt b/src/jabber_whiteboard/dialog/CMakeLists.txt deleted file mode 100644 index 8272a61e2..000000000 --- a/src/jabber_whiteboard/dialog/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -set(jabber_whiteboard_dialog_SRC - choose-desktop.cpp -) diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index 6eb6bdd1d..04b7375b1 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -1,3 +1,4 @@ + set(libavoid_SRC connector.cpp geometry.cpp @@ -14,5 +15,4 @@ set(libavoid_SRC vpsc.cpp ) -add_library(avoid_LIB STATIC ${libavoid_SRC}) -target_link_libraries(avoid_LIB ${INKSCAPE_LIBS}) +add_library(avoid_LIB ${libavoid_SRC}) diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt index 40c92d578..032bffb54 100644 --- a/src/libcola/CMakeLists.txt +++ b/src/libcola/CMakeLists.txt @@ -1,3 +1,4 @@ + set(libcola_SRC cola.cpp conjugate_gradient.cpp @@ -7,5 +8,5 @@ set(libcola_SRC shortest_paths.cpp straightener.cpp ) -add_library(cola_LIB STATIC ${libcola_SRC}) -target_link_libraries(cola_LIB ${INKSCAPE_LIBS}) + +add_library(cola_LIB ${libcola_SRC}) diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt index 3aae8eac4..c4676c504 100644 --- a/src/libcroco/CMakeLists.txt +++ b/src/libcroco/CMakeLists.txt @@ -29,5 +29,4 @@ set(libcroco_SRC cr-utils.c ) -add_library(croco_LIB STATIC ${libcroco_SRC}) -target_link_libraries(croco_LIB ${INKSCAPE_LIBS}) +add_library(croco_LIB ${libcroco_SRC}) diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt index 6411579b3..cf550107a 100644 --- a/src/libgdl/CMakeLists.txt +++ b/src/libgdl/CMakeLists.txt @@ -16,7 +16,6 @@ set(libgdl_SRC gdl-tools.h libgdlmarshal.c libgdltypebuiltins.c - ${GDL_WIN} ) if(WIN32) @@ -25,5 +24,4 @@ if(WIN32) ) endif() -ADD_LIBRARY(gdl_LIB STATIC ${libgdl_SRC}) -TARGET_LINK_LIBRARIES(gdl_LIB ${INKSCAPE_LIBS}) +add_library(gdl_LIB ${libgdl_SRC}) diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt index 28fee7b77..6895e4dbd 100644 --- a/src/libnr/CMakeLists.txt +++ b/src/libnr/CMakeLists.txt @@ -33,5 +33,4 @@ set(libnr_SRC #testnr.cpp ) -add_library(nr_LIB STATIC ${libnr_SRC}) -target_link_libraries(nr_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(nr_LIB ${libnr_SRC}) diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt index 75bb5f57b..069b68bd3 100644 --- a/src/libnrtype/CMakeLists.txt +++ b/src/libnrtype/CMakeLists.txt @@ -1,3 +1,4 @@ + set(libnrtype_SRC FontFactory.cpp FontInstance.cpp @@ -14,5 +15,5 @@ set(libnrtype_SRC RasterFont.cpp TextWrapper.cpp ) -add_library(nrtype_LIB STATIC ${libnrtype_SRC}) -target_link_libraries(nrtype_LIB nr_LIB ${INKSCAPE_LIBS}) + +add_library(nrtype_LIB ${libnrtype_SRC}) diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt index 0a91c3516..ebc1e79d6 100644 --- a/src/libvpsc/CMakeLists.txt +++ b/src/libvpsc/CMakeLists.txt @@ -1,3 +1,4 @@ +
set(libvpsc_SRC
block.cpp
blocks.cpp
@@ -10,5 +11,4 @@ set(libvpsc_SRC pairingheap/PairingHeap.cpp
)
-add_library(vpsc_LIB STATIC ${libvpsc_SRC})
-target_link_libraries(vpsc_LIB ${INKSCAPE_LIBS})
+add_library(vpsc_LIB ${libvpsc_SRC})
diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt index d8f4ba05d..51bb9530e 100644 --- a/src/livarot/CMakeLists.txt +++ b/src/livarot/CMakeLists.txt @@ -1,3 +1,4 @@ + set(livarot_SRC AlphaLigne.cpp AVL.cpp @@ -21,5 +22,4 @@ set(livarot_SRC sweep-tree-list.cpp ) -add_library(livarot_LIB STATIC ${livarot_SRC}) -target_link_libraries(nrtype_LIB ${INKSCAPE_LIBS}) +add_library(livarot_LIB ${livarot_SRC}) diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index 61fedbe66..51f8d957c 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(parameter) set(live_effects_SRC bezctx.cpp @@ -41,8 +40,18 @@ set(live_effects_SRC lpeobject-reference.cpp lpeobject.cpp spiro.cpp - ${live_effects_parameter_SRC} + + parameter/array.cpp + parameter/bool.cpp + parameter/parameter.cpp + parameter/path.cpp + parameter/path-reference.cpp + parameter/point.cpp + parameter/powerstrokepointarray.cpp + parameter/random.cpp + parameter/text.cpp + parameter/unit.cpp + parameter/vector.cpp ) -add_library(live_effects_LIB STATIC ${live_effects_SRC}) -target_link_libraries(live_effects_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(live_effects_LIB ${live_effects_SRC}) diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt deleted file mode 100644 index 04a1080f4..000000000 --- a/src/live_effects/parameter/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(live_effects_parameter_SRC - array.cpp - bool.cpp - parameter.cpp - path.cpp - path-reference.cpp - point.cpp - powerstrokepointarray.cpp - random.cpp - text.cpp - unit.cpp - vector.cpp -) diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt index 4de3592db..8a952f950 100644 --- a/src/pedro/CMakeLists.txt +++ b/src/pedro/CMakeLists.txt @@ -1,3 +1,4 @@ + set(pedro_SRC #empty.cpp #geckoembed.cpp @@ -8,5 +9,5 @@ set(pedro_SRC pedroutil.cpp pedroxmpp.cpp ) -add_library(pedro_LIB STATIC ${pedro_SRC}) -target_link_libraries(pedro_LIB ${INKSCAPE_LIBS}) + +add_library(pedro_LIB ${pedro_SRC}) diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index 4501983bb..1d96f5ac7 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -1,3 +1,4 @@ + set(svg_SRC css-ostringstream.cpp #ftos.cpp @@ -14,5 +15,4 @@ set(svg_SRC #test-stubs.cpp ) -add_library(svg_LIB STATIC ${svg_SRC}) -target_link_libraries(svg_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(svg_LIB ${svg_SRC}) diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt index d3bdcb6b1..84aab77e2 100644 --- a/src/trace/CMakeLists.txt +++ b/src/trace/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(potrace) set(trace_SRC filterset.cpp @@ -7,8 +6,14 @@ set(trace_SRC quantize.cpp siox.cpp trace.cpp - ${trace_potrace_SRC} + + potrace/curve.cpp + potrace/decompose.cpp + potrace/greymap.cpp + potrace/inkscape-potrace.cpp + potrace/potracelib.cpp + potrace/render.cpp + potrace/trace.cpp ) -ADD_LIBRARY(trace_LIB STATIC ${trace_SRC}) -TARGET_LINK_LIBRARIES(trace_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(trace_LIB ${trace_SRC}) diff --git a/src/trace/potrace/CMakeLists.txt b/src/trace/potrace/CMakeLists.txt deleted file mode 100644 index e48d7689f..000000000 --- a/src/trace/potrace/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(trace_potrace_SRC - curve.cpp - decompose.cpp - greymap.cpp - inkscape-potrace.cpp - potracelib.cpp - render.cpp - trace.cpp -) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 5fa882f1a..7c0f18a65 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,12 +1,3 @@ -set(uifolders - cache - dialog - view - widget -) -foreach(uilistsrc ${uifolders}) - add_subdirectory(${uilistsrc}) -endforeach() set(ui_SRC clipboard.cpp @@ -14,6 +5,8 @@ set(ui_SRC previewholder.cpp uxmanager.cpp + cache/svg_preview_cache.cpp + tool/control-point-selection.cpp tool/control-point.cpp tool/curve-drag-point.cpp @@ -27,13 +20,103 @@ set(ui_SRC tool/selectable-control-point.cpp tool/selector.cpp tool/transform-handle-set.cpp - - ${ui_cache_SRC} - ${ui_dialog_SRC} - ${ui_view_SRC} - ${ui_widget_SRC} + + dialog/aboutbox.cpp + dialog/align-and-distribute.cpp + dialog/calligraphic-profile-rename.cpp + dialog/color-item.cpp + dialog/debug.cpp + dialog/desktop-tracker.cpp + dialog/dialog-manager.cpp + dialog/dialog.cpp + dialog/dock-behavior.cpp + dialog/document-metadata.cpp + dialog/document-properties.cpp + dialog/extension-editor.cpp + dialog/extensions.cpp + dialog/filedialog.cpp + dialog/filedialogimpl-gtkmm.cpp + dialog/fill-and-stroke.cpp + dialog/filter-effects-dialog.cpp + dialog/find.cpp + dialog/floating-behavior.cpp + dialog/glyphs.cpp + dialog/guides.cpp + dialog/icon-preview.cpp + dialog/inkscape-preferences.cpp + dialog/input.cpp + dialog/layer-properties.cpp + dialog/layers.cpp + dialog/livepatheffect-editor.cpp + dialog/memory.cpp + dialog/messages.cpp + dialog/ocaldialogs.cpp + dialog/print-colors-preview-dialog.cpp + dialog/print.cpp + dialog/scriptdialog.cpp + # dialog/session-player.cpp + dialog/svg-fonts-dialog.cpp + dialog/swatches.cpp + dialog/tile.cpp + dialog/tracedialog.cpp + dialog/transformation.cpp + dialog/undo-history.cpp + # dialog/whiteboard-connect.cpp + # dialog/whiteboard-sharewithchat.cpp + # dialog/whiteboard-sharewithuser.cpp + + widget/button.cpp + widget/color-picker.cpp + widget/color-preview.cpp + widget/combo-text.cpp + widget/dock-item.cpp + widget/dock.cpp + widget/entity-entry.cpp + widget/entry.cpp + widget/filter-effect-chooser.cpp + widget/handlebox.cpp + widget/icon-widget.cpp + widget/imageicon.cpp + widget/imagetoggler.cpp + widget/labelled.cpp + widget/layer-selector.cpp + widget/licensor.cpp + widget/notebook-page.cpp + widget/object-composite-settings.cpp + widget/page-sizer.cpp + widget/panel.cpp + widget/point.cpp + widget/preferences-widget.cpp + widget/random.cpp + widget/registered-widget.cpp + widget/registry.cpp + widget/rendering-options.cpp + widget/rotateable.cpp + widget/ruler.cpp + widget/scalar-unit.cpp + widget/scalar.cpp + widget/selected-style.cpp + widget/spin-slider.cpp + widget/spinbutton.cpp + widget/style-subject.cpp + widget/style-swatch.cpp + widget/svg-canvas.cpp + widget/text.cpp + widget/tolerance-slider.cpp + widget/toolbox.cpp + widget/unit-menu.cpp + widget/zoom-status.cpp + + view/view.cpp + view/view-widget.cpp ) +if(WIN32) + list(APPEND ui_SRC + dialog/filedialogimpl-win32.cpp + ) +endif() + include_directories( "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}" @@ -42,5 +125,4 @@ include_directories( "${CMAKE_SOURCE_DIR}/extension/dbus" ) -add_library(ui_LIB STATIC ${ui_SRC}) -target_link_libraries(ui_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(ui_LIB ${ui_SRC}) diff --git a/src/ui/cache/CMakeLists.txt b/src/ui/cache/CMakeLists.txt deleted file mode 100644 index c00410de5..000000000 --- a/src/ui/cache/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -set(ui_cache_SRC - svg_preview_cache.cpp -) diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt deleted file mode 100644 index 5f2b31989..000000000 --- a/src/ui/dialog/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ - -set(ui_dialog_SRC - aboutbox.cpp - align-and-distribute.cpp - calligraphic-profile-rename.cpp - color-item.cpp - debug.cpp - desktop-tracker.cpp - dialog-manager.cpp - dialog.cpp - dock-behavior.cpp - document-metadata.cpp - document-properties.cpp - extension-editor.cpp - extensions.cpp - filedialog.cpp - filedialogimpl-gtkmm.cpp - fill-and-stroke.cpp - filter-effects-dialog.cpp - find.cpp - floating-behavior.cpp - glyphs.cpp - guides.cpp - icon-preview.cpp - inkscape-preferences.cpp - input.cpp - layer-properties.cpp - layers.cpp - livepatheffect-editor.cpp - memory.cpp - messages.cpp - ocaldialogs.cpp - print-colors-preview-dialog.cpp - print.cpp - scriptdialog.cpp - # session-player.cpp - svg-fonts-dialog.cpp - swatches.cpp - tile.cpp - tracedialog.cpp - transformation.cpp - undo-history.cpp - # whiteboard-connect.cpp - # whiteboard-sharewithchat.cpp - # whiteboard-sharewithuser.cpp -) - -if(WIN32) - list(APPEND ui_dialog_SRC - filedialogimpl-win32.cpp - ) -endif() diff --git a/src/ui/view/CMakeLists.txt b/src/ui/view/CMakeLists.txt deleted file mode 100644 index c0914d887..000000000 --- a/src/ui/view/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(ui_view_SRC - view.cpp - view-widget.cpp -) diff --git a/src/ui/widget/CMakeLists.txt b/src/ui/widget/CMakeLists.txt deleted file mode 100644 index c81ea5e24..000000000 --- a/src/ui/widget/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -set(ui_widget_SRC - button.cpp - color-picker.cpp - color-preview.cpp - combo-text.cpp - dock-item.cpp - dock.cpp - entity-entry.cpp - entry.cpp - filter-effect-chooser.cpp - handlebox.cpp - icon-widget.cpp - imageicon.cpp - imagetoggler.cpp - labelled.cpp - layer-selector.cpp - licensor.cpp - notebook-page.cpp - object-composite-settings.cpp - page-sizer.cpp - panel.cpp - point.cpp - preferences-widget.cpp - random.cpp - registered-widget.cpp - registry.cpp - rendering-options.cpp - rotateable.cpp - ruler.cpp - scalar-unit.cpp - scalar.cpp - selected-style.cpp - spin-slider.cpp - spinbutton.cpp - style-subject.cpp - style-swatch.cpp - svg-canvas.cpp - text.cpp - tolerance-slider.cpp - toolbox.cpp - unit-menu.cpp - zoom-status.cpp -) diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 330d49662..a5aed5be2 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -7,5 +7,4 @@ set(util_SRC units.cpp ) -add_library(util_LIB STATIC ${util_SRC}) -target_link_libraries(util_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(util_LIB ${util_SRC}) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 4c622fbec..c4f820e52 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -36,5 +36,4 @@ set(widgets_SRC toolbox.cpp ) -add_library(widgets_LIB STATIC ${widgets_SRC}) -target_link_libraries(widgets_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(widgets_LIB ${widgets_SRC}) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 1aafe2d21..353c96998 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -1,3 +1,4 @@ + set(xml_SRC composite-node-observer.cpp croco-node-iface.cpp @@ -17,5 +18,4 @@ set(xml_SRC rebase-hrefs.cpp ) -add_library(xml_LIB STATIC ${xml_SRC}) -target_link_libraries(xml_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(xml_LIB ${xml_SRC}) |