summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua L. Blocher <verbalshadow@gmail.com>2008-04-07 03:53:51 +0000
committerverbalshadow <verbalshadow@users.sourceforge.net>2008-04-07 03:53:51 +0000
commit0d6f91ae5a00d3c995ffd8eec271a053ff9da667 (patch)
tree5b331f8ec85ae6393b5a15aebb7e61fee29a0d61
parentCMake: add optional flags when found (diff)
downloadinkscape-0d6f91ae5a00d3c995ffd8eec271a053ff9da667.tar.gz
inkscape-0d6f91ae5a00d3c995ffd8eec271a053ff9da667.zip
Cmake: Moved CMAKE_C_FLAGS to ConfigCompileFlags.cmake
(bzr r5366)
-rw-r--r--CMakeLists.txt3
-rw-r--r--CMakeScripts/ConfigCompileFlags.cmake1
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02a257491..db50b9231 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,7 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
INCLUDE(ConfigCompileFlags)
INCLUDE(ConfigInkscapeDepends)
-
-SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
+
INCLUDE_DIRECTORIES ("${PROJECT_SOURCE_DIR}" src/)
LINK_DIRECTORIES (src/)
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 4e789bc2e..3c789931c 100644
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -1,3 +1,4 @@
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
SET(COMPILE_WARNING_FLAGS "-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch")
SET(COMPILE_OPTIMIZATION_FLAGS "-O2")