X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=CMakeLists.txt;h=a9b66d436a9a4118ac4f0a163cce2688b878676a;hb=338d6dce719c1981c663a900b95754114934d3ec;hp=58ab4de057415a10bcd1a5837dfeedf19641234c;hpb=931c92216076df5749b9d6bf66ff96c43c82c174;p=inkscape.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58ab4de05..a9b66d436 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,53 +1,36 @@
-PROJECT(inkscape CXX C)
-
-MESSAGE(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")
-
-SET(INKSCAPE_VERSION 0.46+devel)
-SET(PROJECT_NAME inkscape)
-SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
-SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-
-# Set to true if compiler/linker should enable profiling:
-#SET(ENABLE_PROFILING TRUE)
-
-# Probably best to move all these path things to a single file
-IF(WIN32)
-    SET(PACKAGE_LOCALE_DIR "locale")
-ELSEIF(WIN32)
-    # TODO: check and change this to correct value:
-    SET(PACKAGE_LOCALE_DIR "locale")
-ENDIF(WIN32)
-
-
-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)
-
-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}" 
-		COMMAND tar -czf "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz" -C "${CMAKE_BINARY_DIR}" --exclude=".hidden" ${INKSCAPE_DIST_PREFIX}
-		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
-#make unistall target
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+PROJECT(inkscape)
+
+SET(INKSCAPE_VERSION 0.48+devel)
+SET(PROJECT_NAME inkscape)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
+SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
+IF(COMMAND cmake_policy)
+  CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND cmake_policy)
+
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
+
+INCLUDE(ConfigPaths) #Installation Paths
+INCLUDE(DefineDependsandFlags) #Includes, Compiler Flags, and Link Libraries
+INCLUDE(HelperMacros) #Misc Utility Macros
+
+OPTION(ENABLE_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling
+
+#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}" 
+		COMMAND tar -czf "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz" -C "${CMAKE_BINARY_DIR}" --exclude=".hidden" ${INKSCAPE_DIST_PREFIX}
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+
+#make unistall target
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 SET(folders
 src
@@ -57,8 +40,7 @@ doc
 #doc-pak
 po
 )
-
+
 FOREACH(dirlist ${folders})
 ADD_SUBDIRECTORY(${dirlist})
 ENDFOREACH(dirlist)
-