Greatly improved. More serializable, and 32/64 portable.

[inkscape.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9789cd52c278ae7f1c6ed65e7021a34a5cf2d178..89af45e869c52f81c7fd8c45a56ed2cbfc9ac835 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(inkscape CXX C)
 \r
 MESSAGE(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")\r
 \r
-SET(INKSCAPE_VERSION 0.46+devel)
+SET(INKSCAPE_VERSION 0.46+devel)\r
 SET(PROJECT_NAME inkscape)\r
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)\r
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)\r
@@ -30,7 +30,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
 INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigInkscapeDepends)\r
 \r
-INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )\r
+INCLUDE_DIRECTORIES ("${PROJECT_SOURCE_DIR}" src/)\r
 LINK_DIRECTORIES (src/)\r
 \r
 #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")\r
@@ -53,17 +53,17 @@ CONFIGURE_FILE(
 \r
 ADD_CUSTOM_TARGET(uninstall\r
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")\r
-
-SET(folders
-src
-cxxtest
-share
-doc
-#doc-pak
-po
-)
 \r
-FOREACH(dirlist ${folders})
-ADD_SUBDIRECTORY(${dirlist})
-ENDFOREACH(dirlist)
-
+SET(folders\r
+src\r
+cxxtest\r
+share\r
+doc\r
+#doc-pak\r
+po\r
+)\r
+\r
+FOREACH(dirlist ${folders})\r
+ADD_SUBDIRECTORY(${dirlist})\r
+ENDFOREACH(dirlist)\r
+\r