From 9763405dc97a784b66145a6146217537b51fa652 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 31 Mar 2008 19:56:08 +0000
Subject: cmake: add define flags

(bzr r5275)
---
 CMakeScripts/ConfigCompileFlags.cmake    | 13 ++++++++++++-
 CMakeScripts/ConfigInkscapeDepends.cmake |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'CMakeScripts')

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)
-- 
cgit v1.2.3