From 6158a7418ed3f8b8cdfbb3cce8ec680e3ee5d9c8 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Fri, 30 Jan 2015 14:04:54 -0600 Subject: [PATCH] Allow OBS_VERSION_OVERRIDE to assist in packaging. If OBS_VERSION_OVERRIDE is set, it will set the main OBS_VERSION variable to its value. (modified by Jim) --- cmake/Modules/ObsCpack.cmake | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake index cb5e85a57..0e9d2c022 100644 --- a/cmake/Modules/ObsCpack.cmake +++ b/cmake/Modules/ObsCpack.cmake @@ -14,15 +14,20 @@ set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "1") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") -if(EXISTS "${CMAKE_SOURCE_DIR}/.git") - execute_process(COMMAND git describe --always --tags --dirty=-modified - OUTPUT_VARIABLE OBS_VERSION - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_STRIP_TRAILING_WHITESPACE) +if(NOT DEFINED OBS_VERSION_OVERRIDE) + if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + execute_process(COMMAND git describe --always --tags --dirty=-modified + OUTPUT_VARIABLE OBS_VERSION + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + OUTPUT_STRIP_TRAILING_WHITESPACE) + else() + set(OBS_VERSION "${CPACK_PACKAGE_VERSION}") + endif() else() - set(OBS_VERSION "${CPACK_PACKAGE_VERSION}") + set(OBS_VERSION "${OBS_VERSION_OVERRIDE}") endif() +MESSAGE(STATUS "OBS_VERSION: ${OBS_VERSION}") if(INSTALLER_RUN) set(CPACK_PACKAGE_EXECUTABLES