summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2016-01-13 13:51:34 +0100
committerFlorent Le Coz <louiz@louiz.org>2016-01-13 14:01:05 +0100
commit6bebb2f67b73219c455579d5d414418e317e06b9 (patch)
tree4c4bcab0b3fba433ad7b06972516c9751030bda0
parent1e79705628af79b2cf6f87a67268f8202774bb9b (diff)
downloadbiboumi-6bebb2f67b73219c455579d5d414418e317e06b9.tar.gz
biboumi-6bebb2f67b73219c455579d5d414418e317e06b9.tar.bz2
biboumi-6bebb2f67b73219c455579d5d414418e317e06b9.tar.xz
biboumi-6bebb2f67b73219c455579d5d414418e317e06b9.zip
Remove the second '-' from the package when ~dev is there
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3683c39..f38d5d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Mo
#
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR})
if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES ".+")
- set(ARCHIVE_NAME ${ARCHIVE_NAME}-${${PROJECT_NAME}_VERSION_SUFFIX})
+ set(ARCHIVE_NAME ${ARCHIVE_NAME}${${PROJECT_NAME}_VERSION_SUFFIX})
endif()
if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES "^~dev$")
@@ -38,7 +38,7 @@ if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES "^~dev$")
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(GIT_REVISION)
set(${PROJECT_NAME}_VERSION_SUFFIX "${${PROJECT_NAME}_VERSION_SUFFIX} (${GIT_REVISION})")
- set(ARCHIVE_NAME ${ARCHIVE_NAME}-${GIT_REVISION})
+ set(ARCHIVE_NAME ${ARCHIVE_NAME}${GIT_REVISION})
endif()
endif()
endif()