Fix fallback icon loading order for icons with legacy names.

[inkscape.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89af45e869c52f81c7fd8c45a56ed2cbfc9ac835..a9b66d436a9a4118ac4f0a163cce2688b878676a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,69 +1,46 @@
-PROJECT(inkscape CXX C)\r
-\r
-MESSAGE(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")\r
-\r
-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
-\r
-# Set to true if compiler/linker should enable profiling:\r
-#SET(ENABLE_PROFILING TRUE)\r
-\r
-#Pretty colors\r
-SET(CMAKE_COLOR_MAKEFILE ON)\r
-#Choose verbosity level\r
-SET(CMAKE_VERBOSE_MAKEFILE ON)\r
-\r
-# Probably best to move all these path things to a single file\r
-IF(WIN32)\r
-    SET(PACKAGE_LOCALE_DIR "locale")\r
-ELSEIF(WIN32)\r
-    # TODO: check and change this to correct value:\r
-    SET(PACKAGE_LOCALE_DIR "locale")\r
-ENDIF(WIN32)\r
-\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
-\r
-INCLUDE_DIRECTORIES ("${PROJECT_SOURCE_DIR}" src/)\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
-               COMMAND tar -czf "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz" -C "${CMAKE_BINARY_DIR}" --exclude=".hidden" ${INKSCAPE_DIST_PREFIX}\r
-               WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")\r
-\r
-#make unistall target\r
-CONFIGURE_FILE(\r
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"\r
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"\r
-  IMMEDIATE @ONLY)\r
-\r
-ADD_CUSTOM_TARGET(uninstall\r
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")\r
-\r
-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
+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
+cxxtest
+share
+doc
+#doc-pak
+po
+)
+
+FOREACH(dirlist ${folders})
+ADD_SUBDIRECTORY(${dirlist})
+ENDFOREACH(dirlist)