diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2024-03-23 00:18:51 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2024-03-23 16:48:52 -0500 |
| commit | 02f57a47785c89d5574bf9cfd8d6b6279f93e60d (patch) | |
| tree | 47ce33c51dd7e7a138705e437971e1365231b63e /CMake | |
| parent | 3948ac9513b31122e031269c912b206c8389eda4 (diff) | |
Replace SCM_IS_MASTER with SCM_COMMITS_AHEAD_MASTER
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/ScmRevGen.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake index aacf7491ce..5ec3041134 100644 --- a/CMake/ScmRevGen.cmake +++ b/CMake/ScmRevGen.cmake @@ -18,6 +18,10 @@ if(GIT_FOUND) execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE DOLPHIN_WC_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) + # defines DOLPHIN_WC_COMMITS_AHEAD_MASTER + execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^master + OUTPUT_VARIABLE DOLPHIN_WC_COMMITS_AHEAD_MASTER + OUTPUT_STRIP_TRAILING_WHITESPACE) endif() # version number @@ -35,12 +39,7 @@ if(NOT DOLPHIN_WC_REVISION) set(DOLPHIN_WC_DESCRIBE "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}") set(DOLPHIN_WC_REVISION "${DOLPHIN_WC_DESCRIBE} (no further info)") set(DOLPHIN_WC_BRANCH "master") -endif() - -if(DOLPHIN_WC_BRANCH STREQUAL "master" OR DOLPHIN_WC_BRANCH STREQUAL "stable") - set(DOLPHIN_WC_IS_STABLE "1") -else() - set(DOLPHIN_WC_IS_STABLE "0") + set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0) endif() configure_file( |