diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-05-25 18:12:47 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-05-25 18:12:47 +0000 |
| commit | 9f1d57b499f8544523841d2adea4fda404a923ef (patch) | |
| tree | 0d3fc5b10e2dcfe39d5511c1cef57a6ce56c42cd /CMakeScripts/DefineDependsandFlags.cmake | |
| parent | * add rule in configure.ac so that only who has cairo > 1.6.4 (currently cair... (diff) | |
| download | inkscape-9f1d57b499f8544523841d2adea4fda404a923ef.tar.gz inkscape-9f1d57b499f8544523841d2adea4fda404a923ef.zip | |
Cmake: More Dependency work, added new files
(bzr r5754)
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d73554a5d..8a82b6214 100644 --- 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) @@ -18,31 +18,44 @@ find_package(OpenSSL) INCLUDE(IncludeJava)
# end Dependencies +#Linking
+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}" +) + #Includes -
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/ +${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} +${CMAKE_BINARY_DIR}/src ) - #C/C++ Flags #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ") -#Defines
-#SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2") #INCLUDE(ConfigCompileFlags)
INCLUDE(ConfigChecks) |