Code

Node tool: fix snapping of node rotation center
[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake
index e15c4a014aeccfcbc755d039cf5e03dfba961516..89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac 100644 (file)
@@ -1,38 +1,38 @@
-\r
+
 # 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)\r
-find_package(Boost REQUIRED)\r
+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)\r
-INCLUDE(IncludeJava)\r
+find_package(OpenSSL)
+INCLUDE(IncludeJava)
 # end Dependencies
 
-#Linking \r
-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)\r
 INCLUDE(ConfigChecks)