X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=CMakeScripts%2FConfigCompileFlags.cmake;h=d4ed503cb00e4bba5d021b3b0ed7f451a4a7b69a;hb=5c6c297c967ed199fc7e21a97a3d3acfa2d7f089;hp=bf8aab61dc05c2e62c5e75c2979005066d1b2f41;hpb=a7e53932fae17c97591fc858a2e31cf143b7431b;p=inkscape.git

diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index bf8aab61d..d4ed503cb 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,21 +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} ")
-SET(CMAKE_C_FLAGS "${CMAKE_C_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}")