X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=CMakeScripts%2FDefineDependsandFlags.cmake;h=8d23ce08ffc7951c07832d3c2cabb4a8b4dde2e3;hb=68e3bfbbc1aac7dac3e9c06487047f0377b2b3cd;hp=1a690abd309ec50295f5fca00cf659eb9f035e0a;hpb=f145a804e243a9bb2297677e8d03c2ac8a1f364d;p=inkscape.git diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 1a690abd3..8d23ce08f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -20,28 +20,31 @@ INCLUDE(IncludeJava) #Linking 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}" +${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} +${GSL_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${XSLT_INCLUDE_DIRS} ${IMAGEMAGICK++_INCLUDE_DIRS} @@ -54,7 +57,7 @@ ${POPT_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ) #C/C++ Flags -#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ") +INCLUDE_DIRECTORIES(${INK_INCLUDES}) #INCLUDE(ConfigCompileFlags) INCLUDE(ConfigChecks)