diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/genrev.cmake | 78 | ||||
| -rw-r--r-- | cmake/macros/FindGit.cmake | 46 | ||||
| -rw-r--r-- | cmake/options.cmake | 2 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 24 |
4 files changed, 88 insertions, 62 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index 86acc6df22f..35f1a7a11ed 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -8,59 +8,22 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake) +# User has manually chosen to ignore the git-tests, so throw them a warning. +# This is done EACH compile so they can be alerted about the consequences. -# User has manually chosen to ignore the git-tests, so we create an arbitrary string for the revisionhash/date as well -if(DISABLEGITCHECK) - message(STATUS " - By choosing the DISABLEGITCHECK option, you waive all rights for support, and accept - that any or all requests for assistance by you to core developers will be rejected. - - You, as user, take full responsibility for issues, problems etc that might arise - from using the core, as we we can not properly detect what codebase you're using. - - We remind you that you need to use the repository and a proper version of git for - the revision/hash to work, and thus get our support if the need arises. - ") +if(NOT BUILDDIR) + # Workaround for funny MSVC behaviour - this segment only run during compile + set(NO_GIT ${WITHOUT_GIT}) + set(GIT_EXEC ${GIT_EXECUTABLE}) + set(BUILDDIR ${CMAKE_BINARY_DIR}) +endif() - # Set an arbitrary date and hash, so we can match on that - set(rev_date "0000-00-00 00:00:00 +0000") - set(rev_hash "TC-COPY-WITH-NO-GIT-SUPPORT") +if(NO_GIT) + set(rev_date "1970-01-01 00:00:00 +0000") + set(rev_hash "Archived") else() - set(_REQUIRED_GIT_VERSION "1.7") - find_program(GIT_EXEC - NAMES - git git.cmd - HINTS - ENV PATH - DOC "Full path to git commandline client" - ) - MARK_AS_ADVANCED(GIT_EXEC) - - if(NOT GIT_EXEC) - message(FATAL_ERROR " - Git was NOT FOUND on your system - did you forget to install a recent version, or setting the path to it? - Observe that for revision hash/date to work you need at least version ${_REQUIRED_GIT_VERSION}") - else() - execute_process( - COMMAND "${GIT_EXEC}" --version - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_VARIABLE _GIT_VERSION - ERROR_QUIET - ) - - # 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) - - # throw an error if we don't have a recent enough version of git... - if(NOT _GIT_VERSION_OK) - message(FATAL_ERROR " - Git was found but is OUTDATED - did you forget to install a recent version, or setting the path to it? - Observe that for revision hash/date to work you need at least version ${_REQUIRED_GIT_VERSION}") - endif() - endif() - - if(_GIT_VERSION_OK) + if(GIT_EXEC) + # Create a revision-string that we can use execute_process( COMMAND "${GIT_EXEC}" describe --match init --dirty=+ --abbrev=12 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" @@ -68,6 +31,8 @@ else() OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET ) + + # And grab the commits timestamp execute_process( COMMAND "${GIT_EXEC}" show -s --format=%ci WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" @@ -79,11 +44,13 @@ else() # 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) # No valid ways available to find/set the revision/hash, so let's force some defaults - message(STATUS "WARNING - Missing repository tags - you may need to pull tags with git fetch -t") - message(STATUS "WARNING - Continuing anyway - note that the versionstring will be set to 0000-00-00 00:00:00 (Archived)") - set(rev_date "0000-00-00 00:00:00 +0000") + message(STATUS " + Could not find a proper repository signature (hash) - you may need to pull tags with git fetch -t + Continuing anyway - note that the versionstring will be set to 1970-01-01 00:00:00 (Archived)") + set(rev_date "1970-01-01 00:00:00 +0000") set(rev_hash "Archived") else() # Extract information required to build a proper versionstring @@ -91,11 +58,6 @@ else() endif() endif() -# Its not set during initial run -if(NOT BUILDDIR) - set(BUILDDIR ${CMAKE_BINARY_DIR}) -endif() - # Create the actual revision.h file from the above params if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}") configure_file( diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake new file mode 100644 index 00000000000..c23601dbcd8 --- /dev/null +++ b/cmake/macros/FindGit.cmake @@ -0,0 +1,46 @@ +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake) + +set(_REQUIRED_GIT_VERSION "1.7") + +find_program(GIT_EXECUTABLE + NAMES + git git.cmd + HINTS + ENV PATH + DOC "Full path to git commandline client" +) +MARK_AS_ADVANCED(GIT_EXECUTABLE) + +if(NOT GIT_EXECUTABLE) + message(FATAL_ERROR " + Git was NOT FOUND on your system - did you forget to install a recent version, or setting the path to it? + Observe that for revision hash/date to work you need at least version ${_REQUIRED_GIT_VERSION}") +else() + message(STATUS "Found git binary : ${GIT_EXECUTABLE}") + execute_process( + COMMAND "${GIT_EXECUTABLE}" --version + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + OUTPUT_VARIABLE _GIT_VERSION + ERROR_QUIET + ) + + # 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) + + # throw an error if we don't have a recent enough version of git... + if(NOT _GIT_VERSION_OK) + message(STATUS "Git version too old : ${_GIT_VERSION}") + message(FATAL_ERROR " + Git was found but is OUTDATED - did you forget to install a recent version, or setting the path to it? + Observe that for revision hash/date to work you need at least version ${_REQUIRED_GIT_VERSION}") + endif() +endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index 60b828abd7c..ecd58019905 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -15,4 +15,4 @@ option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts" option(USE_COREPCH "Use precompiled headers when compiling servers" 1) option(WITH_WARNINGS "Show all warnings during compile" 0) option(WITH_COREDEBUG "Include additional debug-code in core" 0) -option(DISABLEGITCHECK "Disable the GIT testing routines" 0) +option(WITHOUT_GIT "Disable the GIT testing routines" 0) diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index d3415e4e204..058cce78d09 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -72,10 +72,28 @@ if( WIN32 ) endif() endif( WIN32 ) +if ( WITHOUT_GIT ) + message("* Use GIT revision hash : No") + message("") + message(" *** WITHOUT_GIT - WARNING!") + message(" *** By choosing the WITHOUT_GIT option you have waived all rights for support,") + message(" *** and accept that or all requests for support or assistance sent to the core") + message(" *** developers will be rejected. This due to that we will be unable to detect") + message(" *** what revision of the codebase you are using in a proper way.") + message(" *** We remind you that you need to use the repository codebase and a supported") + message(" *** version of git for the revision-hash to work, and be allowede to ask for") + message(" *** support if needed.") +else() + message("* Use GIT revision hash : Yes") +endif() + if ( NOJEM ) message("") - message("*** WARNING: jemalloc linking has been disabled!") - message("*** Please note that this is for DEBUGGING WITH VALGRIND only!") - message("*** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") + message(" *** NOJEM - WARNING!") + message(" *** jemalloc linking has been disabled!") + message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!") + message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") endif() + message("") + |