Warning cleanup

[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 8a82b6214eb0aa105df718fecedb0e42f38015f0..8d23ce08ffc7951c07832d3c2cabb4a8b4dde2e3 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -2,7 +2,7 @@
 # Include dependencies:
 find_package(GTK2 REQUIRED)
 find_package(GtkMM REQUIRED)
-#find_package(SigC++ REQUIRED)
+find_package(SigC++ REQUIRED)
 find_package(XML2 REQUIRED)
 find_package(XSLT REQUIRED)
 find_package(GSL REQUIRED)
@@ -19,27 +19,32 @@ INCLUDE(IncludeJava)
 # end Dependencies
 
 #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}"
+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}
 )
 
 #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 +55,9 @@ ${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)