From 4f20cb327f420917d761b0fa41e50cb9d4eb1a19 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 13 Jun 2011 21:59:45 +0000
Subject: cmake: - added option WITH_DBUS (currently uses hard coded paths) -
 remove duplicate version variable.

(bzr r10297)
---
 CMakeScripts/ConfigCompileFlags.cmake | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'CMakeScripts/ConfigCompileFlags.cmake')

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