From 05bc395fd6ba43f35afb2d6ffd3ccccad0136e6d Mon Sep 17 00:00:00 2001 From: Hubert Jarosz Date: Wed, 10 Aug 2016 13:00:59 +0200 Subject: [PATCH] move get_git_hash definition to main CMakeLists.txt --- CMakeLists.txt | 15 +++++++++++++++ GetGitHash.cmake | 14 -------------- renderdoc/CMakeLists.txt | 2 -- 3 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 GetGitHash.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 08b285e5c..9aa9a6bfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,21 @@ if(CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR) message(FATAL_ERROR "In-source builds not allowed") endif() +function(get_git_hash _git_hash) + if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + execute_process( + COMMAND git rev-parse HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif() + if(NOT GIT_HASH) + set(GIT_HASH "NO_GIT_COMMIT_HASH_DEFINED") + endif() + set(${_git_hash} "${GIT_HASH}" PARENT_SCOPE) +endfunction(get_git_hash) + project(RenderDoc CXX C) option(ENABLE_GL "Enable GL driver" ON) diff --git a/GetGitHash.cmake b/GetGitHash.cmake deleted file mode 100644 index 2d5623e9d..000000000 --- a/GetGitHash.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(get_git_hash _git_hash) - if(EXISTS "${CMAKE_SOURCE_DIR}/.git") - execute_process( - COMMAND git rev-parse HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() - if(NOT GIT_HASH) - set(GIT_HASH "NO_GIT_COMMIT_HASH_DEFINED") - endif() - set(${_git_hash} "${GIT_HASH}" PARENT_SCOPE) -endfunction(get_git_hash) diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 17bb1dfe8..b65241a71 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -1,5 +1,3 @@ -include("${CMAKE_SOURCE_DIR}/GetGitHash.cmake") - set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(RDOC_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})