Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index b2d3943dfabb4ba16a83d16e764be23eb7ae668f..89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,7 +1,7 @@
 
 # Include dependencies:
-find_package(GTK2 REQUIRED)
-find_package(GtkMM REQUIRED)
+find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
+#find_package(GtkMM REQUIRED)
 find_package(SigC++ REQUIRED)
 find_package(XML2 REQUIRED)
 find_package(XSLT REQUIRED)
@@ -19,21 +19,20 @@ INCLUDE(IncludeJava)
 # end Dependencies
 
 #Linking 
-LIST(APPEND INKSCAPE_LIBS 
-${GTK2_LIBRARIES}
-${GTKMM_LIBRARIES}
-${SIGC++_LIBRARIES}
-${GSL_LIBRARIES}
-${XML2_LIBRARIES}
-${XSLT_LIBRARIES}
-${IMAGEMAGICK++_LIBRARIES}
-${FREETYPE2_LIBRARIES}
-${GNOMEVFS2_LIBRARIES}
-${BOOST_LIBRARIES}
-${BOEHMGC_LIBRARIES}
-${PNG_LIBRARIES}
-${POPT_LIBRARIES}
-${OPENSSL_LIBRARIES}
+LIST(APPEND INKSCAPE_LIBS
+# ${GTK2_LIBRARIES}
+# ${SIGC++_LIBRARIES}
+# ${GSL_LIBRARIES}
+# ${XML2_LIBRARIES}
+# ${XSLT_LIBRARIES}
+# ${IMAGEMAGICK++_LIBRARIES}
+# ${FREETYPE2_LIBRARIES}
+# ${GNOMEVFS2_LIBRARIES}
+# ${BOOST_LIBRARIES}
+# ${BOEHMGC_LIBRARIES}
+# ${PNG_LIBRARIES}
+# ${POPT_LIBRARIES}
+# ${OPENSSL_LIBRARIES}
 )
 
 #Includes 
@@ -42,7 +41,6 @@ ${CMAKE_BINARY_DIR}
 ${PROJECT_SOURCE_DIR}
 ${PROJECT_SOURCE_DIR}/src
 ${GTK2_INCLUDE_DIRS}
-${GTKMM_INCLUDE_DIRS}
 ${SIGC++_INCLUDE_DIRS}
 ${GSL_INCLUDE_DIRS}
 ${XML2_INCLUDE_DIRS}
@@ -59,5 +57,4 @@ ${OPENSSL_INCLUDE_DIRS}
 #C/C++ Flags
 INCLUDE_DIRECTORIES(${INK_INCLUDES})
 
-#INCLUDE(ConfigCompileFlags)
 INCLUDE(ConfigChecks)