X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CPack.txt;h=c33a7dac2391bd6275ceb7abda1c1a418202bcd9;hb=5b5a4fa6195bea592787f903a27e7153985e25a8;hp=52fefe69fb5973f5cd12639b3fa466cbb53c8d6f;hpb=946b9670af4a97be463cae05b5cce6a082d9f475;p=m6w6%2Flibmemcached

diff --git a/CPack.txt b/CPack.txt
index 52fefe69..c33a7dac 100644
--- a/CPack.txt
+++ b/CPack.txt
@@ -38,7 +38,12 @@ set(CPACK_PACKAGE_DESCRIPTION
 memcached server (http://memcached.org/). It has been designed to be
 light on memory usage, thread safe, and provide full access to server
 side methods.")
-list(JOIN PROJECT_CONFIG "-" CPACK_PACKAGE_DIRECTORY)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+    string(REPLACE ";" "-" CPACK_PACKAGE_DIRECTORY "${PROJECT_CONFIG}")
+else()
+    list(JOIN PROJECT_CONFIG "-" CPACK_PACKAGE_DIRECTORY)
+endif()
+set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/CPack/ProjectConfig.txt")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION}")
 set(CPACK_PACKAGE_CHECKSUM SHA1)
@@ -46,13 +51,15 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 set(CPACK_CHANGELOG_FILE "${CMAKE_SOURCE_DIR}/ChangeLog-1.1.md")
 
-
 execute_process(
         COMMAND git describe --tags --match [0-9]*.*
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE PROJECT_TAG
-        ERROR_VARIABLE IGNORED
+        ERROR_VARIABLE GIT_ERROR_OUTPUT
 )
+if(GIT_ERROR_OUTPUT)
+    message(NOTICE "git describe: ${GIT_ERROR_OUTPUT}")
+endif()
 string(STRIP "${PROJECT_TAG}" PROJECT_TAG)
 if(PROJECT_TAG)
     set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_TAG})
@@ -91,9 +98,15 @@ endif()
 # keep last
 include(CPack)
 
+set(PUSH_ARTIFACTS_SH "${CMAKE_SOURCE_DIR}/scripts/push-artifacts.sh")
+if(WIN32)
+    set(PUSH_ARTIFACTS_CMD msys2 -c '${PUSH_ARTIFACTS_SH} ${CPACK_PACKAGE_DIRECTORY}/')
+else()
+    set(PUSH_ARTIFACTS_CMD ${PUSH_ARTIFACTS_SH} ${CPACK_PACKAGE_DIRECTORY}/)
+endif()
+
 add_custom_target(push-artifacts
-        COMMAND ${CMAKE_SOURCE_DIR}/scripts/push-artifacts.sh
-            ${CPACK_PACKAGE_DIRECTORY}/${PROJECT_NAME}-*
+        COMMAND ${PUSH_ARTIFACTS_CMD}
         WORKING_DIRECTORY ${CPACK_BINARY_DIR}
         )