summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-21 10:13:59 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-21 10:13:59 +0000
commit86feb045ef140e0cdeddd3abd8fa7381526e6629 (patch)
treeef9ad68151d8a33513b3ee3e510ff260f3ea9fad /src
parentRectangles can be drawn inside other shapes again. (diff)
downloadinkscape-86feb045ef140e0cdeddd3abd8fa7381526e6629.tar.gz
inkscape-86feb045ef140e0cdeddd3abd8fa7381526e6629.zip
Fixed CMake build.
(bzr r12562)
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67c5be11a..32bcf19a7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -569,21 +569,21 @@ set(inkscape_SRC
# -----------------------------------------------------------------------------
# Setup the executable
# -----------------------------------------------------------------------------
-add_inkscape_lib(sp_LIB "${sp_SRC}")
-add_inkscape_lib(inkscape_LIB "${inkscape_SRC}")
+#add_inkscape_lib(sp_LIB "${sp_SRC}")
+#add_inkscape_lib(inkscape_LIB "${inkscape_SRC}")
# make executable for INKSCAPE
-add_executable(inkscape ${main_SRC})
+add_executable(inkscape ${main_SRC} ${inkscape_SRC} ${sp_SRC})
add_dependencies(inkscape inkscape_version)
target_link_libraries(inkscape
# order from automake
- sp_LIB
+ #sp_LIB
nrtype_LIB
- inkscape_LIB
- sp_LIB # annoying, we need both!
+ #inkscape_LIB
+ #sp_LIB # annoying, we need both!
nrtype_LIB # annoying, we need both!
dom_LIB