summaryrefslogtreecommitdiffstats
path: root/src/helper
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-12 21:27:00 +0000
committerCampbell Barton <ideasman42@gmail.com>2011-06-12 21:27:00 +0000
commitde03354959190a2c5392d79e03dd22dc45777e41 (patch)
tree4bbc9bfc52d66a54926a935df74306b982d36508 /src/helper
parentcmake: commented unused files/dirs, double checked all files compile this time (diff)
downloadinkscape-de03354959190a2c5392d79e03dd22dc45777e41.tar.gz
inkscape-de03354959190a2c5392d79e03dd22dc45777e41.zip
cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs.
(bzr r10274)
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index e2ca2336d..86c5eea10 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -2,7 +2,7 @@ include(UseGlibMarshal)
GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper")
-set(GlibOutput
+set(sp_marshal_SRC
${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
)
@@ -23,9 +23,8 @@ set(helper_SRC
sp-marshal.cpp
sp-marshal.list
# we generate this file and it's .h counter-part
- ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
+ ${sp_marshal_SRC}
)
-add_library(helper STATIC ${helper_SRC})
-target_link_libraries(helper 2geom ${INKSCAPE_LIBS}) \ No newline at end of file
+add_library(helper_LIB STATIC ${helper_SRC})
+target_link_libraries(helper_LIB 2geom_LIB ${INKSCAPE_LIBS})