From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Sun, 30 Mar 2008 20:01:07 +0000 (+0000)
Subject: Cmake: cflags fix
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b777eb7709a6614fa777cccb408bb2d4db0ba8e8;p=inkscape.git

Cmake: cflags fix
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c80565a1..07ed48787 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,6 @@ INCLUDE(ConfigInkscapeDepends)
 INCLUDE_DIRECTORIES (src/)
 LINK_DIRECTORIES (src/)
 
-# Set Compiler Flags
-SET(CMAKE_CXX_FLAGS "${GTK2_CFLAGS} ${cairo_CFLAGS} -Wall")
-SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
-
 #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 #IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")
 #    SET(CMAKE_AR "ar")
diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 4a12365e1..5177248d3 100644
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -19,6 +19,8 @@ FOREACH(dep ${INKSCAPE_DEPENDS})
 #    PKGCONFIG_VERSION(${dep} "${dep}_VERSION")
     IF("${dep}_FOUND")
         message(STATUS "${dep}: FOUND")
+        # Set Compiler Flags
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${dep_name_CFLAGS}")
     ELSE("${dep}_FOUND")
         message(STATUS "${dep}: NOT FOUND")
     ENDIF("${dep}_FOUND")
@@ -45,6 +47,9 @@ ENDFOREACH(opt)
 # end Optional Dependencies
 message(STATUS "")
 message(STATUS "")
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
 INCLUDE (CheckIncludeFiles)
 # usage: CHECK_INCLUDE_FILES (<header> <RESULT_VARIABLE> )