liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3294 from eduperez/master

Browse Source 
Use "find_program" to search for git executable
This commit is contained in:
Ingo Weyrich
2016-05-19 22:43:53 +02:00
parent 39bedf026c 7d97d0da93
commit f5abb46449
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AboutThisBuild.cmake
View File

@@ -5,13 +5,13 @@ find_file(REL_INFO_FILE ReleaseInfo.cmake PATHS "${PROJECT_SOURCE_DIR}" NO_DEFAU
if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
# we look for the git command in this paths by order of preference # we look for the git command in this paths by order of preference
if (WIN32) if (WIN32)
find_file(GIT_CMD git.exe HINTS ENV Path PATH_SUFFIXES ../) find_program(GIT_CMD git.exe HINTS ENV Path PATH_SUFFIXES ../)
elseif (APPLE) elseif (APPLE)
find_file(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") find_program(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
find_file(GIT_CMD git) find_program(GIT_CMD git)
set (SHELL "/bin/bash") set (SHELL "/bin/bash")
else (WIN32) # Linux else (WIN32) # Linux
find_file(GIT_CMD git) find_program(GIT_CMD git)
set (SHELL "/bin/bash") set (SHELL "/bin/bash")
endif (WIN32) endif (WIN32)