diff options
author | SilverBeamx <molto.falso@gmail.com> | 2020-04-07 22:41:45 +0200 |
---|---|---|
committer | SilverBeamx <molto.falso@gmail.com> | 2020-04-07 22:41:45 +0200 |
commit | 6b512d78c994550ff653d519af7784023be5ebd2 (patch) | |
tree | 1036a2ce099a1c097e8dca9ab09bd3306e03e819 /CMakeModules/GenerateSCMRev.cmake | |
parent | 22b5d5211e125f8f59c29caf21f16e6fc5d912ab (diff) |
Addressed feedback: removed CMake hack in favor of building the necessary strings via the supplied title format
Diffstat (limited to 'CMakeModules/GenerateSCMRev.cmake')
-rw-r--r-- | CMakeModules/GenerateSCMRev.cmake | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake index 787e30df1..5d4eccb00 100644 --- a/CMakeModules/GenerateSCMRev.cmake +++ b/CMakeModules/GenerateSCMRev.cmake @@ -20,6 +20,8 @@ get_timestamp(BUILD_DATE) # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well set(REPO_NAME "") set(BUILD_VERSION "0") +set(TITLE_BAR_FORMAT_IDLE "yuzu {5} ") +set(BUILD_ID "420") if (BUILD_REPOSITORY) # regex capture the string nightly or canary into CMAKE_MATCH_1 string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY}) @@ -48,25 +50,6 @@ if (BUILD_REPOSITORY) endif() endif() -# "Hack": Generate BUILD_FULLNAME from the Git desc -if (GIT_DESC) - # regex capture the characters before the first "-" into CMAKE_MATCH_1 - string(REGEX MATCH "^([a-z]*)-.*" OUTVAR ${GIT_DESC}) - if ("${CMAKE_MATCH_COUNT}" GREATER 0) - # capitalize the first letter of the repo name. - string(SUBSTRING ${CMAKE_MATCH_1} 0 1 FIRST_LETTER) - string(SUBSTRING ${CMAKE_MATCH_1} 1 -1 REMAINDER) - string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) - set(REPO_NAME "${FIRST_LETTER}${REMAINDER}") - - # If GIT_DESC has been parsed correctly, build the BUILD_FULLNAME from the repo name and the - # build version - if(REPO_NAME) - set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_ID} ") - endif() - endif() -endif() - # The variable SRC_DIR must be passed into the script (since it uses the current build directory for all values of CMAKE_*_DIR) set(VIDEO_CORE "${SRC_DIR}/src/video_core") set(HASH_FILES |