cmake:

- added option WITH_DBUS (currently uses hard coded paths)
- remove duplicate version variable.

(bzr r10297)

3 files changed, 34 insertions, 22 deletions

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}")
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 6cfb38257..6c0abf362 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -133,9 +133,16 @@ list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY})
 include(IncludeJava)
 # end Dependencies
 
-# message(FATAL_ERROR "Whee: ${INKSCAPE_INCS}")
-# message(FATAL_ERROR "Whee: ${INKSCAPE_LIBS}")
-# message(FATAL_ERROR "Whee: ${INKSCAPE_LINK_DIRS}")
+# ----------------------------------------------------------------------------
+# Optional
+# ----------------------------------------------------------------------------
+
+if(WITH_DBUS)
+	# XXX, needs s module
+	list(APPEND INKSCAPE_INCS "/usr/include/dbus-1.0")
+	list(APPEND INKSCAPE_INCS "/usr/lib/dbus-1.0/include")
+	list(APPEND INKSCAPE_LIBS "/usr/lib/libdbus-1.so")
+endif()
 
 # C/C++ Flags
 include_directories(${INKSCAPE_INCS})
diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 7e53f710b..1d98a5799 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -7,7 +7,6 @@
 
 # We should extract the version from build.xml
 # but for now just hard code
-set(INKSCAPE_VERSION "0.48+devel")
 set(INKSCAPE_REVISION "unknown")
 
 if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
@@ -19,8 +18,13 @@ endif()
 
 file(WRITE
 		${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.txt
+		# unlike autoconf, include config.h
+		"#ifdef HAVE_CONFIG_H\n"
+		"# include <config.h>\n"
+		"#endif\n"
+		"\n"
 		"namespace Inkscape {\n"
-		"    char const *version_string = \"${INKSCAPE_VERSION} ${INKSCAPE_REVISION}\";\n"
+		"    char const *version_string = VERSION \" \" \"${INKSCAPE_REVISION}\";\n"
 		"}\n")
 
 # Copy the file to the final header only if the version changes