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.

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 7d89fd435bb7a53561ba7acf459cfc008cde424d..3dbe4387cbac18b32bc902cc8bc45b95c6e4813f 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -25,6 +25,7 @@ include(UsePkgConfig)
 message(STATUS "")
 message(STATUS "")
 message(STATUS "Checking For REQUIRED Libraries for Building Inkscape.")
+SET(INKSCAPE_LINK_FLAGS "")
 FOREACH(dep ${INKSCAPE_DEPENDS})
     # This is a hack due to a bug in Cmake vars system, Uncomment if using a version older than 2.4 //verbalshadow
 #    IF("${dep}" MATCHES "gtk\\+-2.0")
@@ -40,6 +41,7 @@ FOREACH(dep ${INKSCAPE_DEPENDS})
         message(STATUS "${dep}: FOUND")
         # Set Compiler Flags\r
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")\r
+        SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")\r
     ELSE("${dep}_FOUND")
         message(STATUS "${dep}: NOT FOUND")
     ENDIF("${dep}_FOUND")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02e55762ec352c8c225196c767e3c36ee159971d..c2a3de9ff861c14942aa42457a3dead77092354e 100644 (file)
--- 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