summaryrefslogtreecommitdiffstats
path: root/CMakeScripts/DefineDependsandFlags.cmake
diff options
context:
space:
mode:
authorJoshua L. Blocher <verbalshadow@gmail.com>2008-05-31 14:38:51 +0000
committerverbalshadow <verbalshadow@users.sourceforge.net>2008-05-31 14:38:51 +0000
commit21d952b04eeddd80264ea2f6799acc3d52b83166 (patch)
tree8c4de1de3c5f7a9e27b2714812c7dac4e5755a51 /CMakeScripts/DefineDependsandFlags.cmake
parentStacked LPEs should now use the right bounding box (diff)
downloadinkscape-21d952b04eeddd80264ea2f6799acc3d52b83166.tar.gz
inkscape-21d952b04eeddd80264ea2f6799acc3d52b83166.zip
Cmake: added windows path to find modules.
(bzr r5770)
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
-rw-r--r--CMakeScripts/DefineDependsandFlags.cmake16
1 files changed, 8 insertions, 8 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 5dbc1bf5e..3ca3695fe 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)
@@ -17,12 +17,12 @@ find_package(Popt REQUIRED)
find_package(OpenSSL)
INCLUDE(IncludeJava)
# end Dependencies
-Message(STATUS "${GTKMM_LIBRARIES}-----${GTKMM_INCLUDE_DIRS}")
+
#Linking
-SET(INKSCAPE_LIBS
+LIST(APPEND INKSCAPE_LIBS
"${GTK2_LIBRARIES}"
"${GTKMM_LIBRARIES}"
-#"${SIGC++_LIBRARIES}"
+"${SIGC++_LIBRARIES}"
"${XML2_LIBRARIES}"
"${XSLT_LIBRARIES}"
"${IMAGEMAGICK++_LIBRARIES}"
@@ -37,9 +37,12 @@ SET(INKSCAPE_LIBS
#Includes
INCLUDE_DIRECTORIES(
+${CMAKE_BINARY_DIR}
+${PROJECT_SOURCE_DIR}
+"${CMAKE_BINARY_DIR}/src"
${GTK2_INCLUDE_DIRS}
${GTKMM_INCLUDE_DIRS}
-#${SIGC++_INCLUDE_DIRS}
+${SIGC++_INCLUDE_DIRS}
${XML2_INCLUDE_DIRS}
${XSLT_INCLUDE_DIRS}
${IMAGEMAGICK++_INCLUDE_DIRS}
@@ -50,9 +53,6 @@ ${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} ")