cmake: add define flags

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bb826bccc102e1c0d05570d987de1ef51accc10..6725846577a27d41eb88fa305247e171690316ad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
 INCLUDE(ConfigCompileFlags)\r
-INCLUDE(ConfigInkscapeDepends)\r
+#INCLUDE(ConfigInkscapeDepends)\r
 
 SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")\r
 INCLUDE_DIRECTORIES (src/)\r

diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index ed9783c4a1077cabc3e44f25eb008b41d060a2be..f82fd52bb593bb62db41fb81150be295cd1218bb 100644 (file)
--- 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 1160b856dc571b7c42083193cbd7abafd8c07853..607ce760192284b9c3e2123af2033821f05c8926 100644 (file)
--- 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)