Skip to content
Snippets Groups Projects
Commit a53e8fa3 authored by Lars Bilke's avatar Lars Bilke
Browse files

Finally fixed git finding issues.

Was because of an outdated FindGit-module in ThirdParty/cmake-modules.
parent 992980fd
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,11 @@ cmake_policy(SET CMP0054 NEW) ...@@ -12,6 +12,11 @@ cmake_policy(SET CMP0054 NEW)
# Project name # Project name
project( OGS-6 ) project( OGS-6 )
list(APPEND CMAKE_PREFIX_PATH
$ENV{HOMEBREW_ROOT} # Homebrew package manager on Mac OS
$ENV{CMAKE_LIBRARY_SEARCH_PATH} # Environment variable, Windows
${CMAKE_LIBRARY_SEARCH_PATH}) # CMake option, Windows
########################### ###########################
### Preliminary Options ### ### Preliminary Options ###
########################### ###########################
......
Subproject commit 40dcdf3da89ff69f3c4cc9314312e902cb3889f7 Subproject commit 7f7fe54dd190f1a3dc175f8bae3af748f5e9f696
# Add custom library install prefixes
list(APPEND CMAKE_PREFIX_PATH
$ENV{HOMEBREW_ROOT} # Homebrew package manager on Mac OS
$ENV{CMAKE_LIBRARY_SEARCH_PATH} # Environment variable, Windows
${CMAKE_LIBRARY_SEARCH_PATH}) # CMake option, Windows
###################### ######################
### Find tools ### ### Find tools ###
###################### ######################
...@@ -28,7 +22,7 @@ find_package(cppcheck QUIET) ...@@ -28,7 +22,7 @@ find_package(cppcheck QUIET)
find_package(PythonInterp QUIET) find_package(PythonInterp QUIET)
find_package(Git REQUIRED) find_package(Git REQUIRED)
set(GIT_TOOL_PATH ${Git_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE) set(GIT_TOOL_PATH ${GIT_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE)
# Find bash itself ... # Find bash itself ...
find_program(BASH_TOOL_PATH bash find_program(BASH_TOOL_PATH bash
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
# message("msysGit tools found in: ${MSYSGIT_BIN_DIR}") # message("msysGit tools found in: ${MSYSGIT_BIN_DIR}")
# endif() # endif()
if(Git_EXECUTABLE) if(GIT_EXECUTABLE)
execute_process(COMMAND ${Git_EXECUTABLE} --version execute_process(COMMAND ${GIT_EXECUTABLE} --version
OUTPUT_VARIABLE git_version OUTPUT_VARIABLE git_version
ERROR_QUIET ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
...@@ -24,7 +24,7 @@ if(Git_EXECUTABLE) ...@@ -24,7 +24,7 @@ if(Git_EXECUTABLE)
endif() endif()
if(GIT_IS_MSYSGIT) if(GIT_IS_MSYSGIT)
get_filename_component(MSYS_DIR ${Git_EXECUTABLE} PATH) get_filename_component(MSYS_DIR ${GIT_EXECUTABLE} PATH)
find_path(MSYSGIT_BIN_DIR find_path(MSYSGIT_BIN_DIR
NAMES date.exe grep.exe unzip.exe git.exe PATHS ${MSYS_DIR}/../bin NO_DEFAULT_PATH) NAMES date.exe grep.exe unzip.exe git.exe PATHS ${MSYS_DIR}/../bin NO_DEFAULT_PATH)
else() else()
......
...@@ -81,11 +81,11 @@ function(get_git_head_revision _refspecvar _hashvar) ...@@ -81,11 +81,11 @@ function(get_git_head_revision _refspecvar _hashvar)
endfunction() endfunction()
function(git_describe _var) function(git_describe _var)
if(NOT Git_FOUND) if(NOT GIT_FOUND)
find_package(Git QUIET) find_package(Git QUIET)
endif() endif()
get_git_head_revision(refspec hash) get_git_head_revision(refspec hash)
if(NOT Git_FOUND) if(NOT GIT_FOUND)
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
return() return()
endif() endif()
...@@ -105,7 +105,7 @@ function(git_describe _var) ...@@ -105,7 +105,7 @@ function(git_describe _var)
#message(STATUS "Arguments to execute_process: ${ARGN}") #message(STATUS "Arguments to execute_process: ${ARGN}")
execute_process(COMMAND execute_process(COMMAND
${Git_EXECUTABLE} ${GIT_EXECUTABLE}
describe describe
${hash} ${hash}
${ARGN} ${ARGN}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment