diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake index 37c5ecee67210e06b2bb7bf5c7d7571c5f3ef729..18b78993f25e3288640b87c8d69e2f79a6269811 100644 --- a/scripts/cmake/CMakeSetup.cmake +++ b/scripts/cmake/CMakeSetup.cmake @@ -17,18 +17,23 @@ SET(NUM_PROCESSORS ${NUM_PROCESSORS} CACHE STRING "Processor count") INCLUDE(GetGitRevisionDescription) GET_GIT_HEAD_REVISION(GIT_REFSPEC GIT_SHA1) STRING(SUBSTRING ${GIT_SHA1} 0 8 GIT_SHA1_SHORT) -GIT_GET_TAG(GIT_DESCRIBE) -STRING(REGEX MATCH ^[0-9|\\.]* GIT_TAG ${GIT_DESCRIBE}) -SET(OGS_VERSION ${GIT_TAG}) -IF(GIT_DESCRIBE MATCHES ".*-.*-.*") - # Commit is not a tag - SET(OGS_IS_RELEASE FALSE) - STRING(REGEX MATCH "-([0-9]+)-" GIT_COMMITS_AFTER_TAG ${GIT_DESCRIBE}) +IF($ENV{CI}) + SET(OGS_VERSION 6.6.6) # Dummy version for CI-environment (Travis) ELSE() - SET(OGS_VERSION_STATUS "") - SET(OGS_IS_RELEASE TRUE) - MESSAGE(STATUS "OGS version: ${OGS_VERSION}") + GIT_GET_TAG(GIT_DESCRIBE) + STRING(REGEX MATCH ^[0-9|\\.]* GIT_TAG ${GIT_DESCRIBE}) + SET(OGS_VERSION ${GIT_TAG}) + + IF(GIT_DESCRIBE MATCHES ".*-.*-.*") + # Commit is not a tag + SET(OGS_IS_RELEASE FALSE) + STRING(REGEX MATCH "-([0-9]+)-" GIT_COMMITS_AFTER_TAG ${GIT_DESCRIBE}) + ELSE() + SET(OGS_VERSION_STATUS "") + SET(OGS_IS_RELEASE TRUE) + MESSAGE(STATUS "OGS version: ${OGS_VERSION}") + ENDIF() ENDIF() # Get the hostname