diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /CMakeScripts/ConfigCompileFlags.cmake | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'CMakeScripts/ConfigCompileFlags.cmake')
| -rw-r--r-- | CMakeScripts/ConfigCompileFlags.cmake | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake index bc3b42ef6..0ff66fad8 100644 --- a/CMakeScripts/ConfigCompileFlags.cmake +++ b/CMakeScripts/ConfigCompileFlags.cmake @@ -1,25 +1,26 @@ -SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") -ADD_DEFINITIONS(-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch) -ADD_DEFINITIONS(-O2) +set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") +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) - SET(COMPILE_PROFILING_FLAGS "-pg") - SET(LINK_PROFILING_FLAGS "-pg") -ENDIF (ENABLE_PROFILING) +if(WITH_PROFILING) + set(COMPILE_PROFILING_FLAGS "-pg") + set(LINK_PROFILING_FLAGS "-pg") +endif() -ADD_DEFINITIONS(-DVERSION=\\\"${INKSCAPE_VERSION}\\\") -ADD_DEFINITIONS(${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) - ADD_DEFINITIONS(-DXP_WIN) -ENDIF (WIN32) +if(WIN32) + add_definitions(-DXP_WIN) +endif(WIN32) # for Inkboard: -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; }\"") +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_PROFILING_FLAGS} ") -SET(CMAKE_C_FLAGS "${CMAKE_C_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} ") -#message(STATUS "${CMAKE_CXX_FLAGS}") +set(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ") + +# message(STATUS "${CMAKE_CXX_FLAGS}") |