Cmake: more fixes plus a patch for OSX paths by Henrik Gustafsson

[inkscape.git] / CMakeScripts / DefineDependsandFlags.cmake

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 19cb012ded54cbd9b6da3832bfac6db3b2ef8696..b2d3943dfabb4ba16a83d16e764be23eb7ae668f 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,63 +1,63 @@
-\r
-# Include dependencies:\r
-find_package(GTK2 REQUIRED)\r
-find_package(GtkMM REQUIRED)\r
-find_package(SigC++ REQUIRED)\r
-find_package(XML2 REQUIRED)\r
-find_package(XSLT REQUIRED)\r
-find_package(GSL REQUIRED)\r
-find_package(ImageMagick++ REQUIRED)\r
-find_package(Freetype2 REQUIRED)\r
-find_package(GnomeVFS2)\r
-find_package(Boost REQUIRED)\r
-find_package(BoehmGC REQUIRED)\r
-find_package(LibWPG)\r
-find_package(PNG REQUIRED) \r
-find_package(Popt REQUIRED)\r
-find_package(OpenSSL)\r
-INCLUDE(IncludeJava)\r
-# end Dependencies\r
-\r
-#Linking \r
-LIST(APPEND INKSCAPE_LIBS \r
-${GTK2_LIBRARIES}\r
-${GTKMM_LIBRARIES}\r
-${SIGC++_LIBRARIES}\r
-${GSL_LIBRARIES}\r
-${XML2_LIBRARIES}\r
-${XSLT_LIBRARIES}\r
-${IMAGEMAGICK++_LIBRARIES}\r
-${FREETYPE2_LIBRARIES}\r
-${GNOMEVFS2_LIBRARIES}\r
-${BOOST_LIBRARIES}\r
-${BOEHMGC_LIBRARIES}\r
-${PNG_LIBRARIES}\r
-${POPT_LIBRARIES}\r
-${OPENSSL_LIBRARIES}\r
-)\r
-\r
-#Includes \r
-SET(INK_INCLUDES\r
-${CMAKE_BINARY_DIR}\r
-${PROJECT_SOURCE_DIR}\r
-${PROJECT_SOURCE_DIR}/src\r
-${GTK2_INCLUDE_DIRS}\r
-${GTKMM_INCLUDE_DIRS}\r
-${SIGC++_INCLUDE_DIRS}\r
-${GSL_INCLUDE_DIRS}\r
-${XML2_INCLUDE_DIRS}\r
-${XSLT_INCLUDE_DIRS}\r
-${IMAGEMAGICK++_INCLUDE_DIRS}\r
-${FREETYPE2_INCLUDE_DIRS}\r
-${GNOMEVFS2_INCLUDE_DIRS}\r
-${BOOST_INCLUDE_DIRS}\r
-${BOEHMGC_INCLUDE_DIRS}\r
-${PNG_INCLUDE_DIRS}\r
-${POPT_INCLUDE_DIRS}\r
-${OPENSSL_INCLUDE_DIRS}\r
-)\r
-#C/C++ Flags\r
-INCLUDE_DIRECTORIES(${INK_INCLUDES})\r
-\r
-#INCLUDE(ConfigCompileFlags)\r
-INCLUDE(ConfigChecks)\r
+
+# Include dependencies:
+find_package(GTK2 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(BoehmGC REQUIRED)
+find_package(LibWPG)
+find_package(PNG REQUIRED) 
+find_package(Popt REQUIRED)
+find_package(OpenSSL)
+INCLUDE(IncludeJava)
+# end Dependencies
+
+#Linking 
+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 
+SET(INK_INCLUDES
+${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}
+${FREETYPE2_INCLUDE_DIRS}
+${GNOMEVFS2_INCLUDE_DIRS}
+${BOOST_INCLUDE_DIRS}
+${BOEHMGC_INCLUDE_DIRS}
+${PNG_INCLUDE_DIRS}
+${POPT_INCLUDE_DIRS}
+${OPENSSL_INCLUDE_DIRS}
+)
+#C/C++ Flags
+INCLUDE_DIRECTORIES(${INK_INCLUDES})
+
+#INCLUDE(ConfigCompileFlags)
+INCLUDE(ConfigChecks)