From d89841792f96d922001765f5ec7e84fe0ab02539 Mon Sep 17 00:00:00 2001 From: verbalshadow Date: Wed, 16 Apr 2008 05:18:55 +0000 Subject: [PATCH] Cmake: Add simple CMakeLists.txt for 2geom and linking to inkscape --- src/2geom/CMakeLists.txt | 86 +++++++++++++++++++++++++++ src/CMakeLists.txt | 7 ++- src/extension/internal/CMakeLists.txt | 7 ++- src/pedro/CMakeLists.txt | 15 ++--- 4 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 src/2geom/CMakeLists.txt diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt new file mode 100644 index 000000000..f70931924 --- /dev/null +++ b/src/2geom/CMakeLists.txt @@ -0,0 +1,86 @@ +SET(2geom_SRC +angle.h +basic-intersection.cpp +basic-intersection.h +bezier.h +bezier-to-sbasis.h +bezier-utils.cpp +bezier-utils.h +choose.h +circle-circle.cpp +circulator.h +concepts.h +conjugate_gradient.cpp +conjugate_gradient.h +convex-cover.cpp +convex-cover.h +coord.h +crossing.cpp +crossing.h +d2.h +d2-sbasis.cpp +d2-sbasis.h +exception.h +geom.cpp +geom.h +interval.h +isnan.h +linear.h +makefile.in +Makefile_insert +matrix.cpp +matrix.h +ord.h +path.cpp +path.h +path-intersection.cpp +path-intersection.h +piecewise.cpp +piecewise.h +point.cpp +point.h +point-l.h +point-ops.h +poly.cpp +poly-dk-solve.cpp +poly-dk-solve.h +poly.h +poly-laguerre-solve.cpp +poly-laguerre-solve.h +quadtree.cpp +quadtree.h +rect.h +region.cpp +region.h +sbasis-2d.cpp +sbasis-2d.h +sbasis.cpp +sbasis-geometric.cpp +sbasis-geometric.h +sbasis.h +sbasis-math.cpp +sbasis-math.h +sbasis-poly.cpp +sbasis-poly.h +sbasis-roots.cpp +sbasis-to-bezier.cpp +sbasis-to-bezier.h +shape.cpp +shape.h +solve-bezier-one-d.cpp +solve-bezier-parametric.cpp +solver.h +sturm.h +svg-elliptical-arc.cpp +svg-path.cpp +svg-path.h +svg-path-parser.cpp +svg-path-parser.h +sweep.cpp +sweep.h +transforms.cpp +transforms.h +utils.h +) + +ADD_LIBRARY(2geom STATIC ${2geom_SRC}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a31b58df..75d741103 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,7 +39,7 @@ jabber_whiteboard jabber_whiteboard/dialog live_effects live_effects/parameter -pedro +#pedro removeoverlap svg trace @@ -71,7 +71,8 @@ ENDFOREACH(dirlist) # All directories containing lists files that describe building internal libraries -SET(libfolders +SET(libfolders +2geom application dialogs libavoid @@ -304,7 +305,7 @@ ${ONLY_WIN} # make executable for INKSCAPE ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC}) TARGET_LINK_LIBRARIES(inkscape - "${INKSCAPE_LINK_FLAGS}" avoid cola croco gdl nr nrtype vpsc + "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc ) #INSTALL(TARGETS INKSCAPE # RUNTIME DESTINATION bin diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt index 7125d2e1c..1ed68269a 100644 --- a/src/extension/internal/CMakeLists.txt +++ b/src/extension/internal/CMakeLists.txt @@ -1,3 +1,8 @@ +IF(WIN32) +SET(EXT_INT_WIN +win32.cpp) +ENDIF(WIN32) + SET(extension_internal_SRC bluredge.cpp cairo-pdf-out.cpp @@ -22,6 +27,6 @@ ps.cpp ps-out.cpp svg.cpp svgz.cpp -win32.cpp +${EXT_INT_WIN} wpg-input.cpp ) diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt index fc584022a..c3cdeb3cd 100644 --- a/src/pedro/CMakeLists.txt +++ b/src/pedro/CMakeLists.txt @@ -1,16 +1,17 @@ SET(pedro_SRC -#empty.cpp -#geckoembed.cpp -#geckoembed.h +empty.cpp +geckoembed.cpp +geckoembed.h pedroconfig.cpp pedroconfig.h pedrodom.cpp pedrodom.h -#pedrogui.cpp -#pedrogui.h -#pedromain.cpp +pedrogui.cpp +pedrogui.h +pedromain.cpp pedroutil.cpp pedroutil.h pedroxmpp.cpp pedroxmpp.h -) \ No newline at end of file +) +#ADD_LIBRARY(pedro STATIC ${pedro_SRC}) -- 2.30.2