File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -111,11 +111,13 @@ endif()
111111# Packaging
112112#
113113set (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} )
117119else ()
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} " )
120122endif ()
121123set (CPACK_PACKAGE_CONTACT "Olivier Martin <olivier@labapart.com>" )
You can’t perform that action at this time.
0 commit comments