diff options
| -rw-r--r-- | cmake/genrev.cmake | 16 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index f628755c1a6..b7e0bf16c8b 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -27,10 +27,10 @@ if(_GIT_EXEC) OUTPUT_VARIABLE _GIT_VERSION ERROR_QUIET ) -endif() -# make sure we're using minimum the required version of git, so the "dirty-testing" will work properly -ensure_version( "${_REQUIRED_GIT_VERSION}" "${_GIT_VERSION}" _GIT_VERSION_OK) + # make sure we're using minimum the required version of git, so the "dirty-testing" will work properly + ensure_version( "${_REQUIRED_GIT_VERSION}" "${_GIT_VERSION}" _GIT_VERSION_OK) +endif() if(_GIT_VERSION_OK) execute_process( @@ -42,16 +42,16 @@ if(_GIT_VERSION_OK) ) else() message("") - message(STATUS "OUTDATED GIT-VERSION OR MISSING GIT-COMMAND - DID YOU FORGET TO INSTALL A RECENT VERSION?") - message(STATUS "FOR REVISION-IDS AND HASH-TAGGING TO WORK YOU NEED AT LEAST VERSION ${_REQUIRED_GIT_VERSION}.") + message(STATUS "WARNING - Missing or outdated git - did you forget to install a recent version?") + message(STATUS "WARNING - Observe that for revision ID/hash to work you need at least version ${_REQUIRED_GIT_VERSION}") + message(STATUS "WARNING - Continuing anyway, but setting the revision-ID and hash to Rev:0 Hash: Archive") + message("") endif() # Last minute check - ensure that we have a proper revision # If everything above fails (means the user has erased the git revision control directory or removed the origin/HEAD tag) if(NOT rev_info) - message(STATUS "No revision-information found, setting up for Archived-mode (revision 0, hash 0)") - - # Ok, since we have no valid ways of finding/setting the revision, let's force some defaults + # No valid ways available to find/set the revision/hash, so let's force some defaults set(rev_hash_str "Archive") set(rev_hash "0") set(rev_id_str "0") diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index cd629b8de41..ade607ee409 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -1,6 +1,5 @@ # output generic information about the core and buildtype chosen -message("") message("* TrinityCore revision : ${rev_id_str} (${rev_hash_str})") if( UNIX ) message("* Build binaries in : ${CMAKE_BUILD_TYPE} mode") |