From 06446b611a521b78c65a8d584f2985f455e7a8b9 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 26 Apr 2017 10:18:03 -0400 Subject: Merge pull request #1194 from snoack/version Add -DVERSION flag for release version numbers --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 017b0994..9ed45830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,10 @@ endif() list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) -if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) + +if (VERSION) + add_definitions(-DSWAY_VERSION=\"${VERSION}\") +else() execute_process( COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_COMMIT_HASH @@ -33,13 +36,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) -endif() -add_definitions(-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\") -add_definitions(-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\") - -string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) -add_definitions(-DSWAY_VERSION_DATE=\"${CURRENT_DATE}\") + string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) + add_definitions("-DSWAY_VERSION=\"${GIT_COMMIT_HASH} (${CURRENT_DATE}, branch \\\"${GIT_BRANCH}\\\")\"") +endif() option(enable-swaylock "Enables the swaylock utility" YES) option(enable-swaybg "Enables the wallpaper utility" YES) -- cgit v1.2.3-70-g09d2