2 files changed, 54 insertions, 47 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b3d60329..2f556b051 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,8 +49,62 @@ configure_file(
 		"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 		IMMEDIATE @ONLY)
 
+configure_file(
+		"${CMAKE_CURRENT_SOURCE_DIR}/inkscape.desktop.in"
+		"${CMAKE_BINARY_DIR}/inkscape.desktop"
+		IMMEDIATE @ONLY)
+
 add_custom_target(uninstall
 		"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 
 add_subdirectory(src)
+
+
+
+# -----------------------------------------------------------------------------
+# Installation
+# -----------------------------------------------------------------------------
+
+if(UNIX)
+	# TODO: man, locale, icons
+
+	# message after building.
+	add_custom_command(
+		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
+	)
+
+	install(
+		PROGRAMS ${CMAKE_BINARY_DIR}/src/inkscape
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+	)
+
+	install(
+		FILES ${CMAKE_BINARY_DIR}/inkscape.desktop
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+	)
+
+	install(
+		DIRECTORY
+			${CMAKE_SOURCE_DIR}/share/clipart
+			${CMAKE_SOURCE_DIR}/share/examples
+			${CMAKE_SOURCE_DIR}/share/extensions
+			${CMAKE_SOURCE_DIR}/share/filters
+			${CMAKE_SOURCE_DIR}/share/fonts
+			${CMAKE_SOURCE_DIR}/share/gradients
+			${CMAKE_SOURCE_DIR}/share/icons
+			${CMAKE_SOURCE_DIR}/share/keys
+			${CMAKE_SOURCE_DIR}/share/markers
+			${CMAKE_SOURCE_DIR}/share/palettes
+			${CMAKE_SOURCE_DIR}/share/patterns
+			${CMAKE_SOURCE_DIR}/share/screens
+			${CMAKE_SOURCE_DIR}/share/templates
+			${CMAKE_SOURCE_DIR}/share/tutorials
+			${CMAKE_SOURCE_DIR}/share/ui
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/inkscape
+	)
+
+else()
+	# TODO, WIN32/APPLE
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index afb65f955..d048eaa87 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -599,50 +599,3 @@ target_link_libraries(inkscape
 #add_executable(inkview inkview.cpp)
 # ...
 
-
-# -----------------------------------------------------------------------------
-# Installation
-# -----------------------------------------------------------------------------
-
-if(UNIX)
-	# TODO: man, locale, icons
-
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
-	)
-
-	install(
-		PROGRAMS inkscape
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-	)
-
-	install(
-		FILES ${CMAKE_SOURCE_DIR}/inkscape.desktop
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-	)
-
-	install(
-		DIRECTORY
-			${CMAKE_SOURCE_DIR}/share/clipart
-			${CMAKE_SOURCE_DIR}/share/examples
-			${CMAKE_SOURCE_DIR}/share/extensions
-			${CMAKE_SOURCE_DIR}/share/filters
-			${CMAKE_SOURCE_DIR}/share/fonts
-			${CMAKE_SOURCE_DIR}/share/gradients
-			${CMAKE_SOURCE_DIR}/share/icons
-			${CMAKE_SOURCE_DIR}/share/keys
-			${CMAKE_SOURCE_DIR}/share/markers
-			${CMAKE_SOURCE_DIR}/share/palettes
-			${CMAKE_SOURCE_DIR}/share/patterns
-			${CMAKE_SOURCE_DIR}/share/screens
-			${CMAKE_SOURCE_DIR}/share/templates
-			${CMAKE_SOURCE_DIR}/share/tutorials
-			${CMAKE_SOURCE_DIR}/share/ui
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/inkscape
-	)
-
-else()
-	# TODO, WIN32/APPLE
-endif()