From 610352e4385a8a80d00290acbb348557898c8b5e Mon Sep 17 00:00:00 2001 From: Aaron Spike Date: Sun, 6 Apr 2008 02:40:07 +0000 Subject: CMake build work - Comment inkview.cpp because it is another executable file. These will each need to be separated into their own targets. - Move deptool.cpp into win32 only. perhaps this isn't used at all for cmake builds. - aggregate all the link flags into a var and pass to the linker to avoid platform specific naming conventions. (bzr r5356) --- src/CMakeLists.txt | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02e55762e..c2a3de9ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ IF(WIN32) SET(ONLY_WIN -registrytool.cpp) +registrytool.cpp +deptool.cpp) ELSEIF(WIN32) SET(ONLY_WIN) ENDIF(WIN32) @@ -20,7 +21,6 @@ conn-avoid-ref.cpp connector-context.cpp console-output-undo-observer.cpp context-fns.cpp -deptool.cpp desktop-affine.cpp desktop.cpp desktop-events.cpp @@ -59,7 +59,9 @@ help.cpp ink-action.cpp inkscape.cpp inkscape-stock.cpp -inkview.cpp +##inkview is another executable file +##needs to be separated as a second target +#inkview.cpp interface.cpp knot.cpp knotholder.cpp @@ -189,7 +191,7 @@ streams-handles.cpp streams-jar.cpp streams-zlib.cpp style.cpp -style-test.cpp +#style-test.cpp svg-view.cpp svg-view-widget.cpp text-chemistry.cpp @@ -235,22 +237,9 @@ ${ui_SRC} # make executable for INKSCAPE ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC}) -TARGET_LINK_LIBRARIES(inkscape - gtk+-2.0 - gtkmm-2.4 - cairo - cairomm-1.0 - sigc++-2.0 - lcms - libgc1c2 - libpng - glib-2.0 - glibmm-2.4 - libxml-2.0 - libxslt - ImageMagick++ - libpopt - freetype2) +TARGET_LINK_LIBRARIES(inkscape + "${INKSCAPE_LINK_FLAGS}" +) #INSTALL(TARGETS INKSCAPE # RUNTIME DESTINATION bin # LIBRARY DESTINATION lib -- cgit v1.2.3