X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CPack.txt;h=c33a7dac2391bd6275ceb7abda1c1a418202bcd9;hb=b0d3e9495b7efb51b47ea77075e9f5a2c59ef63f;hp=92ea450381c2646d49ae231dab1b1eff220479cf;hpb=d089107e59bb1f5fb6fb567a4be33c4788b0181f;p=awesomized%2Flibmemcached

diff --git a/CPack.txt b/CPack.txt
index 92ea4503..c33a7dac 100644
--- a/CPack.txt
+++ b/CPack.txt
@@ -38,7 +38,11 @@ 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}")
@@ -53,7 +57,7 @@ execute_process(
         OUTPUT_VARIABLE PROJECT_TAG
         ERROR_VARIABLE GIT_ERROR_OUTPUT
 )
-if(ERROR_OUTPUT)
+if(GIT_ERROR_OUTPUT)
     message(NOTICE "git describe: ${GIT_ERROR_OUTPUT}")
 endif()
 string(STRIP "${PROJECT_TAG}" PROJECT_TAG)
@@ -94,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
-            bash ${CMAKE_SOURCE_DIR}/scripts/push-artifacts.sh "${CPACK_PACKAGE_DIRECTORY}/"
+        COMMAND ${PUSH_ARTIFACTS_CMD}
         WORKING_DIRECTORY ${CPACK_BINARY_DIR}
         )