Node tool: fix snapping of node rotation center

[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 5dbc1bf5e0446c2e5d1a3a967d002b7e4e889072..89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,45 +1,48 @@
-\r
+
 # Include dependencies:
-find_package(GTK2 REQUIRED)
-find_package(GtkMM REQUIRED)
-#find_package(SigC++ 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
-Message(STATUS "${GTKMM_LIBRARIES}-----${GTKMM_INCLUDE_DIRS}")
-#Linking \r
-SET(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 
-INCLUDE_DIRECTORIES( 
+SET(INK_INCLUDES
+${CMAKE_BINARY_DIR}
+${PROJECT_SOURCE_DIR}
+${PROJECT_SOURCE_DIR}/src
 ${GTK2_INCLUDE_DIRS}
-${GTKMM_INCLUDE_DIRS}
-#${SIGC++_INCLUDE_DIRS}
+${SIGC++_INCLUDE_DIRS}
+${GSL_INCLUDE_DIRS}
 ${XML2_INCLUDE_DIRS}
 ${XSLT_INCLUDE_DIRS}
 ${IMAGEMAGICK++_INCLUDE_DIRS}
@@ -50,12 +53,8 @@ ${BOEHMGC_INCLUDE_DIRS}
 ${PNG_INCLUDE_DIRS}
 ${POPT_INCLUDE_DIRS}
 ${OPENSSL_INCLUDE_DIRS}
-${CMAKE_BINARY_DIR}
-${PROJECT_SOURCE_DIR}
-${CMAKE_BINARY_DIR}/src
 )
 #C/C++ Flags
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ")
+INCLUDE_DIRECTORIES(${INK_INCLUDES})
 
-#INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigChecks)