X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=CMakeScripts%2FDefineDependsandFlags.cmake;h=89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac;hb=74ab8b52ffb455151c92e61ac9600a8cd4500b07;hp=7b09ed8f3cf94954734ef57c68d12ef3781835ce;hpb=e73f0453347f368e991f2786425eb1f65aeabd80;p=inkscape.git

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 7b09ed8f3..89f33114d 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,38 +1,38 @@
-
+
 # 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)
 find_package(GSL REQUIRED)
 find_package(ImageMagick++ REQUIRED)
 find_package(Freetype2 REQUIRED)
-find_package(GnomeVFS2)
-find_package(Boost REQUIRED)
+find_package(GnomeVFS2)
+find_package(Boost REQUIRED)
 find_package(BoehmGC REQUIRED)
 find_package(LibWPG)
 find_package(PNG REQUIRED) 
 find_package(Popt REQUIRED)
-find_package(OpenSSL)
-INCLUDE(IncludeJava)
+find_package(OpenSSL)
+INCLUDE(IncludeJava)
 # end Dependencies
 
-#Linking 
-LIST(APPEND INKSCAPE_LIBS 
-"${GTK2_LIBRARIES}"
-"${GTKMM_LIBRARIES}"
-"${SIGC++_LIBRARIES}"
-"${XML2_LIBRARIES}"
-"${XSLT_LIBRARIES}"
-"${IMAGEMAGICK++_LIBRARIES}"
-"${FREETYPE2_LIBRARIES}"
-"${GNOMEVFS2_LIBRARIES}"
-"${BOOST_LIBRARIES}"
-"${BOEHMGC_LIBRARIES}"
-"${PNG_LIBRARIES}"
-"${POPT_LIBRARIES}"
-"${OPENSSL_LIBRARIES}"
+#Linking 
+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 
@@ -41,8 +41,8 @@ ${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}
 ${XSLT_INCLUDE_DIRS}
 ${IMAGEMAGICK++_INCLUDE_DIRS}
@@ -57,5 +57,4 @@ ${OPENSSL_INCLUDE_DIRS}
 #C/C++ Flags
 INCLUDE_DIRECTORIES(${INK_INCLUDES})
 
-#INCLUDE(ConfigCompileFlags)
 INCLUDE(ConfigChecks)