summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorAaron Spike <aaron@ekips.org>2008-04-06 02:40:07 +0000
committeracspike <acspike@users.sourceforge.net>2008-04-06 02:40:07 +0000
commit610352e4385a8a80d00290acbb348557898c8b5e (patch)
tree6b5117f14f8896f1654780dd1d10ee7c4c506401 /CMakeScripts
parentCmake: Added link libraries (diff)
downloadinkscape-610352e4385a8a80d00290acbb348557898c8b5e.tar.gz
inkscape-610352e4385a8a80d00290acbb348557898c8b5e.zip
CMake build work
- Comment inkview.cpp because it is another executable file. These will each need to be separated into their own targets. - Move deptool.cpp into win32 only. perhaps this isn't used at all for cmake builds. - aggregate all the link flags into a var and pass to the linker to avoid platform specific naming conventions. (bzr r5356)
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/ConfigInkscapeDepends.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 7d89fd435..3dbe4387c 100644
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -25,6 +25,7 @@ include(UsePkgConfig)
message(STATUS "")
message(STATUS "")
message(STATUS "Checking For REQUIRED Libraries for Building Inkscape.")
+SET(INKSCAPE_LINK_FLAGS "")
FOREACH(dep ${INKSCAPE_DEPENDS})
# This is a hack due to a bug in Cmake vars system, Uncomment if using a version older than 2.4 //verbalshadow
# IF("${dep}" MATCHES "gtk\\+-2.0")
@@ -40,6 +41,7 @@ FOREACH(dep ${INKSCAPE_DEPENDS})
message(STATUS "${dep}: FOUND")
# Set Compiler Flags
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")
+ SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")
ELSE("${dep}_FOUND")
message(STATUS "${dep}: NOT FOUND")
ENDIF("${dep}_FOUND")