diff options
| author | Aaron Spike <aaron@ekips.org> | 2008-04-10 01:09:31 +0000 |
|---|---|---|
| committer | acspike <acspike@users.sourceforge.net> | 2008-04-10 01:09:31 +0000 |
| commit | 8c038e9e346e09974eae7dfdd9dc02a95dd62281 (patch) | |
| tree | bb5846a187b001a09dfaa7270076f3fbf9e6decb /CMakeScripts | |
| parent | don't set -j anything by default - its not useful and may cause breakage debu... (diff) | |
| download | inkscape-8c038e9e346e09974eae7dfdd9dc02a95dd62281.tar.gz inkscape-8c038e9e346e09974eae7dfdd9dc02a95dd62281.zip | |
replace setting flags as variables with use of add_definitions() to avoid quoting issues and because it looks like the proper cmake way
(bzr r5396)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigCompileFlags.cmake | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake index 0d88be71e..679af6c92 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) @@ -9,20 +9,18 @@ IF (ENABLE_PROFILING) 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; }\" ") +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_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} ") +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} ") |