diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-03-31 19:56:08 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-03-31 19:56:08 +0000 |
| commit | 9763405dc97a784b66145a6146217537b51fa652 (patch) | |
| tree | 10b50d7b66e648176774cbb8c685cb2eb92e8de8 | |
| parent | add specific location for compiler flags; like optimization, define, debug an... (diff) | |
| download | inkscape-9763405dc97a784b66145a6146217537b51fa652.tar.gz inkscape-9763405dc97a784b66145a6146217537b51fa652.zip | |
cmake: add define flags
(bzr r5275)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CMakeScripts/ConfigCompileFlags.cmake | 13 | ||||
| -rw-r--r-- | CMakeScripts/ConfigInkscapeDepends.cmake | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bb826bcc..672584657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) SET(CMAKE_SKIP_RPATH:BOOL OFF)
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
INCLUDE(ConfigCompileFlags)
-INCLUDE(ConfigInkscapeDepends)
+#INCLUDE(ConfigInkscapeDepends)
SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")
INCLUDE_DIRECTORIES (src/)
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake index ed9783c4a..f82fd52bb 100644 --- a/CMakeScripts/ConfigCompileFlags.cmake +++ b/CMakeScripts/ConfigCompileFlags.cmake @@ -1,7 +1,18 @@ SET(COMPILE_WARNING_FLAGS "-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch") SET(COMPILE_OPTIMIZATION_FLAGS "-O2") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_WARNING_FLAGS} ${COMPILE_OPTIMIZATION_FLAGS} -DVERSION=\\\"${INKSCAPE_VERSION}\\\" ") +SET(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} ") +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} -DVERSION=\\\"${INKSCAPE_VERSION}\\\" ") SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2") diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake index 1160b856d..607ce7601 100644 --- a/CMakeScripts/ConfigInkscapeDepends.cmake +++ b/CMakeScripts/ConfigInkscapeDepends.cmake @@ -50,7 +50,6 @@ ENDFOREACH(opt) message(STATUS "") message(STATUS "") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2") INCLUDE (CheckIncludeFiles) |