Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Fix build info compile definition

Browse Source
This commit is contained in:
Elias Steurer 2020-08-10 17:39:42 +02:00
parent d930f0d7d3
commit 13b7bd80fa
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -11,6 +11,34 @@ set(CMAKE_CXX_STANDARD 20)
set(QT_TELEMTRY_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/Common/qt-google-analytics/)
set(QT_BREAKPAD_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/Common/qt-breakpad/)
find_package(Git REQUIRED)
if(WIN32)
set(date_command "CMD" )
set(date_arg "/c date /t")
elseif(APPLE)
set(date_command "date")
set(date_arg " +%y.%m.%d")
elseif(UNIX)
set(date_command "date")
set(date_arg "")
endif()
execute_process(COMMAND
${date_command} ${date_arg}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE BUILD_DATE
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND
"${GIT_EXECUTABLE}" describe --always
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_COMMIT_HASH
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
add_compile_definitions(COMPILE_INFO="${BUILD_DATE} + ${GIT_COMMIT_HASH}")
project(ScreenPlay)
add_subdirectory(ScreenPlay)

2
ScreenPlay/src/settings.cpp
View File

@ -118,7 +118,7 @@ Settings::Settings(const std::shared_ptr<GlobalVariables>& globalVariables,
}
setupWidgetAndWindowPaths();
setGitBuildHash("GIT_VERSION");
setGitBuildHash(COMPILE_INFO);
}
/*!