Prefer cmake3 command, add --cmake=PATH option

This commit is contained in:
Dominik Charousset 2019-10-19 17:42:00 +02:00
parent af76637c96
commit 2885f3ead4

31
configure vendored
View file

@ -4,19 +4,11 @@
set -e set -e
command="$0 $*" command="$0 $*"
# check for `cmake` command
type cmake > /dev/null 2>&1 || {
echo "\
This package requires CMake, please install it first, then you may
use this configure script to access CMake equivalent functionality.\
" >&2;
exit 1;
}
usage="\ usage="\
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
Build Options: Build Options:
--cmake=PATH custom path to a CMake binary
--builddir=DIR place build files in directory [build] --builddir=DIR place build files in directory [build]
--build-dir=DIR alias for --builddir --build-dir=DIR alias for --builddir
--build-type=TYPE set CMake build type [RelWithDebInfo]: --build-type=TYPE set CMake build type [RelWithDebInfo]:
@ -169,6 +161,9 @@ while [ $# -ne 0 ]; do
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1
;; ;;
--cmake=*)
CMakeCommand=$optarg
;;
--builddir=*) --builddir=*)
builddir=$optarg builddir=$optarg
;; ;;
@ -338,6 +333,20 @@ while [ $# -ne 0 ]; do
shift shift
done done
if [ -z "$CMakeCommand" ]; then
# prefer cmake3 over "regular" cmake (cmake == cmake2 on RHEL)
if type cmake3 &> /dev/null ; then
CMakeCommand="cmake3"
elif type cmake &> /dev/null ; then
CMakeCommand="cmake"
else
echo "This package requires CMake, please install it first."
echo "Then you may use this script to configure the CMake build."
echo "Note: pass --cmake=PATH to use cmake in non-standard locations."
exit 1;
fi
fi
if [ "$user_set_scriptdir" != "true" ]; then if [ "$user_set_scriptdir" != "true" ]; then
append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek
fi fi
@ -363,9 +372,9 @@ echo "Source Directory: $sourcedir"
cd $builddir cd $builddir
if [ -n "$CMakeGenerator" ]; then if [ -n "$CMakeGenerator" ]; then
cmake -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir "$CMakeCommand" -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir
else else
cmake $CMakeCacheEntries $sourcedir "$CMakeCommand" $CMakeCacheEntries $sourcedir
fi fi
echo "# This is the command used to configure this build" > config.status echo "# This is the command used to configure this build" > config.status