X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeScripts%2FConfigCompileFlags.cmake;h=bc3b42ef63473805853ef0bf125a3913485c6f09;hb=c5d9e146907665d8fae8684b6da25058db4285ea;hp=3c789931cd9430db9a3547896e75fa83cda6f0bd;hpb=31607e917447418c9ea5afc295c7888388fca438;p=inkscape.git

diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 3c789931c..bc3b42ef6 100644
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -1,6 +1,6 @@
 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")
+ADD_DEFINITIONS(-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch)
+ADD_DEFINITIONS(-O2)
 
 #define the flags for profiling if desired:
 IF (ENABLE_PROFILING)
@@ -8,20 +8,18 @@ IF (ENABLE_PROFILING)
     SET(LINK_PROFILING_FLAGS "-pg")
 ENDIF (ENABLE_PROFILING)
 
-
-SET(DEFINE_FLAGS "${DEFINE_FLAGS} -DVERSION=\\\"${INKSCAPE_VERSION}\\\"")
-SET(DEFINE_FLAGS "${DEFINE_FLAGS} -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE ")
+ADD_DEFINITIONS(-DVERSION=\\\"${INKSCAPE_VERSION}\\\")
+ADD_DEFINITIONS(${DEFINE_FLAGS} -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE)
 
 IF (WIN32)
-     SET(DEFINE_FLAGS "${DEFINE_FLAGS} -DXP_WIN")
-ELSE(WIN32)
-#     SET(DEFINE_FLAGS "${DEFINE_FLAGS} ")
+     ADD_DEFINITIONS(-DXP_WIN)
 ENDIF (WIN32)
 
 # for Inkboard:
-SET(DEFINE_FLAGS "${DEFINE_FLAGS} -DHAVE_SSL -DRELAYTOOL_SSL=\"static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }\" ")
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_WARNING_FLAGS} ${COMPILE_OPTIMIZATION_FLAGS} ${DEFINE_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
+ADD_DEFINITIONS(-DHAVE_SSL "-DRELAYTOOL_SSL=\"static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }\"")
 
-SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
 
+SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ")
+#message(STATUS "${CMAKE_CXX_FLAGS}")