alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #135 from Luminarys/master

Browse source 
Added in build version based on git hash
This commit is contained in:
Drew DeVault 2015-08-26 10:18:06 -04:00
parent 93482312f9 429fc53e51
commit c4257055eb
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -6,6 +6,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin/")
add_definitions("-Wall -Wextra -Wno-unused-parameter") add_definitions("-Wall -Wextra -Wno-unused-parameter")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
execute_process(
COMMAND git describe --always
OUTPUT_VARIABLE GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"")
add_definitions("${GIT_VERSION_FLAG}")
find_package(XKBCommon REQUIRED) find_package(XKBCommon REQUIRED)
find_package(WLC REQUIRED) find_package(WLC REQUIRED)
find_package(A2X REQUIRED) find_package(A2X REQUIRED)

6
sway/main.c
View file

@ -78,7 +78,11 @@ int main(int argc, char **argv) {
debug = 1; debug = 1;
break; break;
case 'v': // version case 'v': // version
// todo #ifdef SWAY_GIT_VERSION
fprintf(stdout, "sway build %s\n", SWAY_GIT_VERSION);
#else
fprintf(stdout, "version not detected\n");
#endif
exit(0); exit(0);
break; break;
case 'V': // verbose case 'V': // verbose