diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7d41f69153a6426347573606357444c1267cee2..fe73be98749a9420cdae82c25c46c3f4323aed3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,11 @@ cmake_policy(SET CMP0054 NEW)
 # Project name
 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 ###
 ###########################
diff --git a/ThirdParty/cmake-modules b/ThirdParty/cmake-modules
index 40dcdf3da89ff69f3c4cc9314312e902cb3889f7..7f7fe54dd190f1a3dc175f8bae3af748f5e9f696 160000
--- a/ThirdParty/cmake-modules
+++ b/ThirdParty/cmake-modules
@@ -1 +1 @@
-Subproject commit 40dcdf3da89ff69f3c4cc9314312e902cb3889f7
+Subproject commit 7f7fe54dd190f1a3dc175f8bae3af748f5e9f696
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index df1e425fdac5c3aa7bf08f16ae41ea783826bf91..7e84172a1bb55bc5cac196ec7b59fe3f921778d2 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -1,9 +1,3 @@
-# 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     ###
 ######################
@@ -28,7 +22,7 @@ find_package(cppcheck QUIET)
 find_package(PythonInterp QUIET)
 
 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_program(BASH_TOOL_PATH bash
diff --git a/scripts/cmake/cmake/FindMsysGit.cmake b/scripts/cmake/cmake/FindMsysGit.cmake
index ef43d3b415ddb9a33cab6193e5097a95b4b2e75b..9312a0dd72493b63ab8c1264130bdf014dc21c8a 100644
--- a/scripts/cmake/cmake/FindMsysGit.cmake
+++ b/scripts/cmake/cmake/FindMsysGit.cmake
@@ -7,8 +7,8 @@
 #     message("msysGit tools found in: ${MSYSGIT_BIN_DIR}")
 #   endif()
 
-if(Git_EXECUTABLE)
-	execute_process(COMMAND ${Git_EXECUTABLE} --version
+if(GIT_EXECUTABLE)
+	execute_process(COMMAND ${GIT_EXECUTABLE} --version
 									OUTPUT_VARIABLE git_version
 									ERROR_QUIET
 									OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -24,7 +24,7 @@ if(Git_EXECUTABLE)
 endif()
 
 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
 	NAMES date.exe grep.exe unzip.exe git.exe PATHS ${MSYS_DIR}/../bin NO_DEFAULT_PATH)
 else()
diff --git a/scripts/cmake/cmake/GetGitRevisionDescription.cmake b/scripts/cmake/cmake/GetGitRevisionDescription.cmake
index 3a4879d0ebd90a243b177063779fd2d3fbf9c005..16a70433be4d957311e7b39cb85a3f44f0a9ae92 100644
--- a/scripts/cmake/cmake/GetGitRevisionDescription.cmake
+++ b/scripts/cmake/cmake/GetGitRevisionDescription.cmake
@@ -81,11 +81,11 @@ function(get_git_head_revision _refspecvar _hashvar)
 endfunction()
 
 function(git_describe _var)
-	if(NOT Git_FOUND)
+	if(NOT GIT_FOUND)
 		find_package(Git QUIET)
 	endif()
 	get_git_head_revision(refspec hash)
-	if(NOT Git_FOUND)
+	if(NOT GIT_FOUND)
 		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
 		return()
 	endif()
@@ -105,7 +105,7 @@ function(git_describe _var)
 	#message(STATUS "Arguments to execute_process: ${ARGN}")
 
 	execute_process(COMMAND
-		${Git_EXECUTABLE}
+		${GIT_EXECUTABLE}
 		describe
 		${hash}
 		${ARGN}