summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-07-01 18:57:32 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-07-01 18:57:32 +0000
commit22262f2db6747eb516283b92abcfd348c700911a (patch)
tree010d0f5c42e6f6240a8f8ff7acb67bd3bb26ccc1 /CMakeScripts
parentAdded more tests (diff)
downloadinkscape-22262f2db6747eb516283b92abcfd348c700911a.tar.gz
inkscape-22262f2db6747eb516283b92abcfd348c700911a.zip
Added xmlNodes as range function
(bzr r14954.1.12)
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/ConfigCompileFlags.cmake21
1 files changed, 7 insertions, 14 deletions
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 602886219..85a8a151c 100644
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -1,28 +1,21 @@
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-add_definitions(-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch)
-# TODO temporary flag
-add_definitions(-O0)
-add_definitions(-std=c++11)
-
# Define the flags for profiling if desired:
if(WITH_PROFILING)
set(COMPILE_PROFILING_FLAGS "-pg")
set(LINK_PROFILING_FLAGS "-pg")
endif()
-add_definitions(-DVERSION=\\\"${INKSCAPE_VERSION}\\\")
+# add_definitions(-DVERSION=\\\"${INKSCAPE_VERSION}\\\")
add_definitions(${DEFINE_FLAGS} -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE)
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; }\"")
-
-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} -O2 ${COMPILE_PROFILING_FLAGS} ")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 ${COMPILE_PROFILING_FLAGS} ")
+# TODO
+add_definitions("-std=c++11")
-set(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ")
+#set(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ")
-# message(STATUS "${CMAKE_CXX_FLAGS}")
+message(STATUS "${CMAKE_CXX_FLAGS}")