diff options
author | Sebastian Noack <sebastian.noack@gmail.com> | 2017-04-26 11:29:30 +0200 |
---|---|---|
committer | Sebastian Noack <sebastian.noack@gmail.com> | 2017-04-26 15:56:46 +0200 |
commit | 173b3385675b24fb7a55f2d212e2958970f6e6d3 (patch) | |
tree | e824215c8066a9ed3072f73edc5afd5ce3d7ee80 /CMakeLists.txt | |
parent | Merge pull request #1187 from 4e554c4c/master (diff) | |
download | sway-173b3385675b24fb7a55f2d212e2958970f6e6d3.tar.gz sway-173b3385675b24fb7a55f2d212e2958970f6e6d3.tar.zst sway-173b3385675b24fb7a55f2d212e2958970f6e6d3.zip |
Add -DVERSION flag for release version numbers
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 017b0994..9ed45830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -20,7 +20,10 @@ endif() | |||
20 | list(INSERT CMAKE_MODULE_PATH 0 | 20 | list(INSERT CMAKE_MODULE_PATH 0 |
21 | ${CMAKE_CURRENT_SOURCE_DIR}/CMake | 21 | ${CMAKE_CURRENT_SOURCE_DIR}/CMake |
22 | ) | 22 | ) |
23 | if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) | 23 | |
24 | if (VERSION) | ||
25 | add_definitions(-DSWAY_VERSION=\"${VERSION}\") | ||
26 | else() | ||
24 | execute_process( | 27 | execute_process( |
25 | COMMAND git describe --always --tags | 28 | COMMAND git describe --always --tags |
26 | OUTPUT_VARIABLE GIT_COMMIT_HASH | 29 | OUTPUT_VARIABLE GIT_COMMIT_HASH |
@@ -33,13 +36,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) | |||
33 | OUTPUT_STRIP_TRAILING_WHITESPACE | 36 | OUTPUT_STRIP_TRAILING_WHITESPACE |
34 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | 37 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
35 | ) | 38 | ) |
36 | endif() | ||
37 | 39 | ||
38 | add_definitions(-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\") | 40 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) |
39 | add_definitions(-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\") | 41 | add_definitions("-DSWAY_VERSION=\"${GIT_COMMIT_HASH} (${CURRENT_DATE}, branch \\\"${GIT_BRANCH}\\\")\"") |
40 | 42 | endif() | |
41 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) | ||
42 | add_definitions(-DSWAY_VERSION_DATE=\"${CURRENT_DATE}\") | ||
43 | 43 | ||
44 | option(enable-swaylock "Enables the swaylock utility" YES) | 44 | option(enable-swaylock "Enables the swaylock utility" YES) |
45 | option(enable-swaybg "Enables the wallpaper utility" YES) | 45 | option(enable-swaybg "Enables the wallpaper utility" YES) |