X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=CMakeLists.txt;h=e3327eb2f5c74c4c1576b7b79533c4ae99e5d2ac;hb=5c6c297c967ed199fc7e21a97a3d3acfa2d7f089;hp=0df1c0e69da73c513c2d480dd751d4af96fc18e5;hpb=9efa90a14f617d756ada86d166a3509042565469;p=inkscape.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df1c0e69..e3327eb2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,17 @@
-PROJECT(inkscape CXX C)
-SET(INKSCAPE_VERSION 0.46+devel)
+PROJECT(inkscape)
+
+SET(INKSCAPE_VERSION 0.46+devel)
 SET(PROJECT_NAME inkscape)
-SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
-# Set to true if compiler/linker should enable profiling:
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
+INCLUDE(ConfigPaths)
+INCLUDE(DefineDependsandFlags)
+INCLUDE(HelperMacros)
+
# Set to true if compiler/linker should enable profiling:
 #SET(ENABLE_PROFILING TRUE)
 
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-SET(CMAKE_SKIP_RPATH:BOOL OFF)
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
-INCLUDE(ConfigCompileFlags)
-INCLUDE(ConfigInkscapeDepends)
-
-SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )
-LINK_DIRECTORIES (src/)
-
-#SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
-#IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")
-#    SET(CMAKE_AR "ar")
-#    SET(CMAKE_RANLIB "ranlib")
-#ENDIF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")
-
 #make dist target
 SET(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")
 ADD_CUSTOM_TARGET(dist svn export --force -q "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}" 
@@ -37,17 +26,16 @@ CONFIGURE_FILE(
 
 ADD_CUSTOM_TARGET(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-SET(folders
-src
-cxxtest
-share
-doc
-#doc-pak
-po
-)
 
-FOREACH(dirlist ${folders})
-ADD_SUBDIRECTORY(${dirlist})
+SET(folders
+src
+cxxtest
+share
+doc
+#doc-pak
+po
+)
+
+FOREACH(dirlist ${folders})
+ADD_SUBDIRECTORY(${dirlist})
 ENDFOREACH(dirlist)
-