diff --git a/.gitattributes b/.gitattributes index 1f15ca3de..a0d77c3c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,5 @@ *.lib binary *.png binary *.slvs binary + +/CMakeLists.txt ident diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f0df15b8..83a0a5179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,17 +22,10 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX # project -# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds -# can come from a variety of sources. If you are mirroring the sources or otherwise build when -# the .git directory is not present, please comment the following line: -include(GetGitCommitHash) -# and instead uncomment the following, adding the complete git hash of the checkout you are using: -# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000) - project(solvespace) set(solvespace_VERSION_MAJOR 3) set(solvespace_VERSION_MINOR 0) -string(SUBSTRING "${GIT_COMMIT_HASH}" 0 8 solvespace_GIT_HASH) +string(SUBSTRING "$Id$" 5 8 solvespace_GIT_HASH) set(ENABLE_GUI ON CACHE BOOL "Whether the graphical interface is enabled") diff --git a/cmake/GetGitCommitHash.cmake b/cmake/GetGitCommitHash.cmake deleted file mode 100644 index f67a844a4..000000000 --- a/cmake/GetGitCommitHash.cmake +++ /dev/null @@ -1,35 +0,0 @@ -function(get_git_commit_hash) - get_filename_component(GIT_DESCRIBE_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - get_filename_component(GIT_ROOT ${GIT_DESCRIBE_CMAKE_DIR} PATH) - set(GIT_DIR "${GIT_ROOT}/.git") - - # Add a CMake configure dependency to the currently checked out revision. - set(GIT_DEPENDS ${GIT_DIR}/HEAD) - file(READ ${GIT_DIR}/HEAD HEAD_REF) - if(HEAD_REF MATCHES "ref: (.+)\n") - set(HEAD_REF ${CMAKE_MATCH_1}) - if(EXISTS "${GIT_DIR}/${HEAD_REF}") - list(APPEND GIT_DEPENDS ${GIT_DIR}/${HEAD_REF}) - file(READ ${GIT_DIR}/${HEAD_REF} HEAD_REF) - elseif(EXISTS "${GIT_DIR}/packed-refs") - list(APPEND GIT_DEPENDS ${GIT_DIR}/packed-refs) - file(READ "${GIT_DIR}/packed-refs" PACKED_REFS) - if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}") - set(HEAD_REF ${CMAKE_MATCH_1}) - else() - set(HEAD_REF "") - endif() - else() - set(HEAD_REF "") - endif() - endif() - set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${GIT_DEPENDS}) - - string(STRIP ${HEAD_REF} HEAD_REF) - if(HEAD_REF STREQUAL "") - message(WARNING "Cannot determine git HEAD") - else() - set(GIT_COMMIT_HASH ${HEAD_REF} PARENT_SCOPE) - endif() -endfunction() -get_git_commit_hash()