IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restructure shell detection code

Browse Source 
It will now first check for an environment variable GNC_SHELL and use
that if it exists. Then hardcode a shell if cmake detects the old
mingw environment (not mingw64), and finally fall back to cmake's
built-in method of finding bash.
This requires a fix in gnucash-on-osx for the build on that platform
to continue to work: on that platform, we should set GNC_SHELL
before starting the build. A patch has been submitted to do that
automatically for the user.
This commit is contained in:
Geert Janssens 2019-06-03 11:14:17 +02:00
parent 170651602c
commit 727348eff3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -109,21 +109,30 @@ set(SYSCONFDIR_BUILD ${CMAKE_BINARY_DIR}/etc)
set(LIBEXECDIR_BUILD ${CMAKE_BINARY_DIR}/libexec) set(LIBEXECDIR_BUILD ${CMAKE_BINARY_DIR}/libexec)
set(BINDIR_BUILD ${CMAKE_BINARY_DIR}/bin) set(BINDIR_BUILD ${CMAKE_BINARY_DIR}/bin)
set(SHELL_FROM_ENV $ENV{SHELL}) # We need to distinguish between MinGW.org and MinGW-w64:
set(SHELL /bin/bash)
#We need to distinguish between MinGW.org and MinGW-w64:
if (MINGW) if (MINGW)
string(FIND ${CMAKE_C_COMPILER} "msys2" IS_MSYS2) string(FIND ${CMAKE_C_COMPILER} "msys2" IS_MSYS2)
if(${IS_MSYS2} GREATER_EQUAL 0) if(${IS_MSYS2} GREATER_EQUAL 0)
set(MINGW64 ON) set(MINGW64 ON)
endif() endif()
endif(MINGW) endif(MINGW)
if (MINGW AND NOT MINGW64) # /bin/bash will work fine on MinGW
# Find a proper bash executable
set(GNC_SHELL $ENV{GNC_SHELL})
if (GNC_SHELL) # Replacing this with if ($ENV{GNC_SHELL}) doesn't work.
# Allow shell override by setting the GNC_SHELL environment variable
set(SHELL ${GNC_SHELL})
elseif (MINGW AND NOT MINGW64)
# Old mingw's bash is on on the path, so hard-code it for now
set(SHELL ${CMAKE_PREFIX_PATH}/mingw/msys/1.0/bin/bash.exe) set(SHELL ${CMAKE_PREFIX_PATH}/mingw/msys/1.0/bin/bash.exe)
endif() else()
if (SHELL_FROM_ENV) # Replacing this with if ($ENV{SHELL}) doesn't work. find_package(UnixCommands)
set(SHELL ${SHELL_FROM_ENV}) if (BASH)
set(SHELL ${BASH})
else()
message(SEND_ERROR "Can't find a suitable bash executable. Please set GNC_SHELL.")
endif()
endif() endif()
# Determine whether we are building from a VCS or from a tarball # Determine whether we are building from a VCS or from a tarball