diff options
| author | click <click@gonnamakeyou.com> | 2011-04-28 18:53:23 +0200 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2011-04-28 18:53:23 +0200 |
| commit | 6a431f745c9d2906de34530e24c85933fe587d65 (patch) | |
| tree | f8ba0ffe37095db8c58702e08708965a314ef579 /cmake | |
| parent | 2d752b974a40a5dc28908413d21533fb9839a156 (diff) | |
Core: get rid of the revision-id once and for all - it's not useful in a DVCS at all
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/genrev.cmake | 8 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index b7e0bf16c8b..9ac4c04019e 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -54,14 +54,10 @@ if(NOT rev_info) # 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") - set(rev_id "0") else() # Extract revision and hash from git string(REGEX REPLACE init-|[0-9]+-g "" rev_hash_str ${rev_info}) string(REGEX REPLACE [+]+ "" rev_hash ${rev_hash_str}) - string(REGEX REPLACE init-|-g[^+]+ "" rev_id_str ${rev_info}) - string(REGEX REPLACE [+]+ "" rev_id ${rev_id_str}) endif() # Its not set during initial run @@ -70,11 +66,11 @@ if(NOT BUILDDIR) endif() # Create the actual revision.h file from the above params -if(NOT "${rev_id_cached}" MATCHES "${rev_id_str}") +if(NOT "${rev_hash_cached}" MATCHES "${rev_hash_str}") configure_file( "${CMAKE_SOURCE_DIR}/revision.h.in.cmake" "${BUILDDIR}/revision.h" @ONLY ) - set(rev_id_cached "${rev_id_str}" CACHE INTERNAL "Cached revision ID") + set(rev_hash_cached "${rev_hash_str}" CACHE INTERNAL "Cached commit-hash") endif() diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index ade607ee409..246c0a54e79 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -1,6 +1,6 @@ # output generic information about the core and buildtype chosen - -message("* TrinityCore revision : ${rev_id_str} (${rev_hash_str})") +message("") +message("* TrinityCore commithash : ${rev_hash_str}") if( UNIX ) message("* Build binaries in : ${CMAKE_BUILD_TYPE} mode") endif() |