Translations. French translation minor update.

[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d73554a5d8d72f11a13b4af23887687edf9c5625..89f33114dd175a9e1fed5e8d04e8f8a06d1b65ac 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,48 +1,60 @@
-\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
 
-#Includes 
-\r
-INCLUDE_DIRECTORIES( 
-"${GTK2_INCLUDE_DIRS}"
-"${GtkMM_INCLUDE_DIRS}"
-"${SigC++_INCLUDE_DIRS}"
-"${XML2_INCLUDE_DIRS}"
-"${XSLT_INCLUDE_DIRS}"
-"${ImageMagick++_INCLUDE_DIRS}"
-"${Freetype2_INCLUDE_DIRS}"
-"${GnomeVFS2_INCLUDE_DIRS}"
-"${Boost_INCLUDE_DIRS}"
-"${BoehmGC_INCLUDE_DIRS}"
-"${PNG_INCLUDE_DIRS}"
-"${Popt_INCLUDE_DIRS}"
-"${OpenSSL_INCLUDE_DIRS}"
-"${CMAKE_BINARY_DIR}"
-"${PROJECT_SOURCE_DIR}"
- src/
+#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 
+SET(INK_INCLUDES
+${CMAKE_BINARY_DIR}
+${PROJECT_SOURCE_DIR}
+${PROJECT_SOURCE_DIR}/src
+${GTK2_INCLUDE_DIRS}
+${SIGC++_INCLUDE_DIRS}
+${GSL_INCLUDE_DIRS}
+${XML2_INCLUDE_DIRS}
+${XSLT_INCLUDE_DIRS}
+${IMAGEMAGICK++_INCLUDE_DIRS}
+${FREETYPE2_INCLUDE_DIRS}
+${GNOMEVFS2_INCLUDE_DIRS}
+${BOOST_INCLUDE_DIRS}
+${BOEHMGC_INCLUDE_DIRS}
+${PNG_INCLUDE_DIRS}
+${POPT_INCLUDE_DIRS}
+${OPENSSL_INCLUDE_DIRS}
+)
 #C/C++ Flags
-#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ")
-#Defines\r
-#SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
+INCLUDE_DIRECTORIES(${INK_INCLUDES})
 
-#INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigChecks)