From 6a67cb04fa02da56a4906f20a894274086e6c67a Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 23 Jan 2018 00:53:38 +0100
Subject: CPack fixes

---
 CMakeScripts/ConfigCPack.cmake         | 21 +++++----------------
 share/icons/application/CMakeLists.txt |  3 ++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake
index a02b3e20a..f8dacbcec 100644
--- a/CMakeScripts/ConfigCPack.cmake
+++ b/CMakeScripts/ConfigCPack.cmake
@@ -14,32 +14,21 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/GPL2.txt")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
 set(CPACK_PACKAGE_VERSION_MAJOR ${INKSCAPE_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${INKSCAPE_VERSION_MINOR})
-FIND_PROGRAM(DATE_CMD date)
-IF(WIN32)
-    execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
-ELSEIF(DATE_CMD)
-    EXECUTE_PROCESS(COMMAND "${DATE_CMD}" +%Y%m%d%H%M
-        OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-ELSE()
-    set(CPACK_PACKAGE_VERSION_PATCH ${INKSCAPE_VERSION_PATCH})
-ENDIF()
+set(CPACK_PACKAGE_VERSION_PATCH ${INKSCAPE_VERSION_PATCH})
 
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${INKSCAPE_VERSION_SUFFIX}")
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${INKSCAPE_VERSION_SUFFIX}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
-set(CPACK_PACKAGE_CONTACT "Inkscape developers")
 set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj*/;tags;cscope.*")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
+set(INKSCAPE_DIST_PREFIX ${INKSCAPE_DIST_PREFIX}_${INKSCAPE_REVISION_DATE}_${INKSCAPE_REVISION_HASH})
+set(CPACK_SOURCE_PACKAGE_FILE_NAME ${INKSCAPE_DIST_PREFIX})
+set(CPACK_PACKAGE_FILE_NAME ${INKSCAPE_DIST_PREFIX})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "inkscape")
 set(CPACK_SOURCE_GENERATOR "TXZ")
 
-
 ## Windows ##
 
 if (WIN32)
     set(CPACK_GENERATOR "ZIP")
-
     ### nsis generator
     find_package(NSIS)
     if (NSIS_MAKE)
diff --git a/share/icons/application/CMakeLists.txt b/share/icons/application/CMakeLists.txt
index f93b4068e..6322ba87b 100644
--- a/share/icons/application/CMakeLists.txt
+++ b/share/icons/application/CMakeLists.txt
@@ -6,4 +6,5 @@ foreach(pixmap_size ${PIXMAP_SIZES})
 endforeach(pixmap_size)
 
 # I hope that this is actually run after installing the files.
-install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/icons/${THEME})")
\ No newline at end of file
+install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/icons/${THEME})")
+install(FILES ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/icons/${THEME}/icon-theme.cache DESTINATION ${SHARE_INSTALL}/icons/${THEME})
-- 
cgit v1.2.3