Skip to content

Commit 42c9f26

Browse files
committed
CMakeLists.txt: Fix version number
1 parent 6a770e4 commit 42c9f26

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,13 @@ endif()
111111
# Packaging
112112
#
113113
set(CPACK_PACKAGE_INSTALL_DIRECTORY /usr CACHE STRING "Install directory (default: /usr).")
114-
if (ENV{TRAVIS_TAG} AND (NOT "ENV{TRAVIS_TAG}" STREQUAL "dev"))
114+
if (DEFINED ENV{TRAVIS_TAG} AND (NOT "ENV{TRAVIS_TAG}" STREQUAL "dev"))
115115
message("Package Gattlib for tagged version $ENV{TRAVIS_TAG}")
116-
set(CPACK_PACKAGE_VERSION $ENV{TRAVIS_TAG})
116+
117+
# Transform 'v0.3' into '0.3' and 'v0.3-rc1' into '0.3-rc1'
118+
string(REGEX REPLACE "v([0-9]+).([0-9]+)(.*)" "\\1.\\2\\3" CPACK_PACKAGE_VERSION $ENV{TRAVIS_TAG})
117119
else()
118-
set(CPACK_PACKAGE_VERSION 0.2-dev)
120+
set(CPACK_PACKAGE_VERSION 0.3-dev)
119121
message("Package Gattlib for development version $ENV{CPACK_PACKAGE_VERSION}")
120122
endif()
121123
set(CPACK_PACKAGE_CONTACT "Olivier Martin <olivier@labapart.com>")

0 commit comments

Comments
 (0)