X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CPack.txt;h=c33a7dac2391bd6275ceb7abda1c1a418202bcd9;hb=9b0cb8f7aac22ccb4eff6dcabcae4db627217efa;hp=09fb62078b9c980c9fa3992153cfd9553d4102cf;hpb=1419585ea96c095448da2a455580f5905ddd2177;p=awesomized%2Flibmemcached diff --git a/CPack.txt b/CPack.txt index 09fb6207..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)