Cmake: cflags fix

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c80565a1dd989e1c52e2c9bb39f31a5728fc0ec..07ed48787ad0a54580abe561157fe2c91b6fcd71 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,6 @@ INCLUDE(ConfigInkscapeDepends)
 INCLUDE_DIRECTORIES (src/)\r
 LINK_DIRECTORIES (src/)\r
 \r
-# Set Compiler Flags\r
-SET(CMAKE_CXX_FLAGS "${GTK2_CFLAGS} ${cairo_CFLAGS} -Wall")\r
-SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")\r
-\r
 #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")\r
 #IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")\r
 #    SET(CMAKE_AR "ar")\r

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 4a12365e1f3e8fc8057a4b30a6bff03afec63825..5177248d3ef7c97f7684fd0957cf930645b60370 100644 (file)
--- 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\r
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${dep_name_CFLAGS}")\r
     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> )