summaryrefslogtreecommitdiffstats
path: root/src/helper
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-13 00:19:17 +0000
committerCampbell Barton <ideasman42@gmail.com>2011-06-13 00:19:17 +0000
commit7172735786c43c2305a92ffd4e5d285d11f88f7f (patch)
treecde79c7dbcbd0d5a26c21bf136fa43b157057912 /src/helper
parentcmake: fix for error reading non existing file which would error out cmake's ... (diff)
downloadinkscape-7172735786c43c2305a92ffd4e5d285d11f88f7f.tar.gz
inkscape-7172735786c43c2305a92ffd4e5d285d11f88f7f.zip
cmake:
turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276)
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
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})