Cmake: More Dependency work, added new files

[inkscape.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df1c0e69da73c513c2d480dd751d4af96fc18e5..e3327eb2f5c74c4c1576b7b79533c4ae99e5d2ac 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,17 @@
-PROJECT(inkscape CXX C)\r
-SET(INKSCAPE_VERSION 0.46+devel)
+PROJECT(inkscape)\r
+\r
+SET(INKSCAPE_VERSION 0.46+devel)\r
 SET(PROJECT_NAME inkscape)\r
-SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)\r
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)\r
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)\r
 \r
-# Set to true if compiler/linker should enable profiling:\r
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
+INCLUDE(ConfigPaths)
+INCLUDE(DefineDependsandFlags)\r
+INCLUDE(HelperMacros)
+\r# Set to true if compiler/linker should enable profiling:\r
 #SET(ENABLE_PROFILING TRUE)\r
 \r
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)\r
-SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
-INCLUDE(ConfigCompileFlags)\r
-INCLUDE(ConfigInkscapeDepends)\r
-
-SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")\r
-INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )\r
-LINK_DIRECTORIES (src/)\r
-\r
-#SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")\r
-#IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")\r
-#    SET(CMAKE_AR "ar")\r
-#    SET(CMAKE_RANLIB "ranlib")\r
-#ENDIF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")\r
-\r
 #make dist target\r
 SET(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")\r
 ADD_CUSTOM_TARGET(dist svn export --force -q "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}" \r
@@ -37,17 +26,16 @@ 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})
+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)
-