Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add configure --display-cmake argument

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-11-02 12:29:47 -07:00
parent f8eb2d9241
commit 04ba6033c6
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
configure vendored
View file

@ -114,6 +114,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--osx-sysroot=PATH path to the OS X SDK to compile against --osx-sysroot=PATH path to the OS X SDK to compile against
--osx-min-version=VER minimum OS X version (the deployment target) --osx-min-version=VER minimum OS X version (the deployment target)
--display-cmake don't create build configuration, just output final CMake invocation
Influential Environment Variables (only on first invocation Influential Environment Variables (only on first invocation
per build directory): per build directory):
CC C compiler command CC C compiler command
@ -160,6 +162,7 @@ remove_cache_entry() {
builddir=build builddir=build
prefix=/usr/local/zeek prefix=/usr/local/zeek
CMakeCacheEntries="" CMakeCacheEntries=""
display_cmake=0
append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix
append_cache_entry ZEEK_ROOT_DIR PATH $prefix append_cache_entry ZEEK_ROOT_DIR PATH $prefix
append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek
@ -409,6 +412,9 @@ while [ $# -ne 0 ]; do
--osx-min-version=*) --osx-min-version=*)
append_cache_entry CMAKE_OSX_DEPLOYMENT_TARGET STRING $optarg append_cache_entry CMAKE_OSX_DEPLOYMENT_TARGET STRING $optarg
;; ;;
--display-cmake)
display_cmake=1
;;
*) *)
echo "Invalid option '$1'. Try $0 --help to see available options." echo "Invalid option '$1'. Try $0 --help to see available options."
exit 1 exit 1
@ -458,11 +464,18 @@ cd $builddir
echo "Using $(cmake --version | head -1)" echo "Using $(cmake --version | head -1)"
echo echo
if [ -n "$CMakeGenerator" ]; then if [ -n "$CMakeGenerator" ]; then
"$CMakeCommand" -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir cmake="${CMakeCommand} -G ${CMakeGenerator} ${CMakeCacheEntries} ${sourcedir}"
else else
"$CMakeCommand" $CMakeCacheEntries $sourcedir cmake="${CMakeCommand} ${CMakeCacheEntries} ${sourcedir}"
fi fi
if [ "${display_cmake}" = 1 ]; then
echo "${cmake}"
exit 0
fi
eval ${cmake} 2>&1
echo "# This is the command used to configure this build" >config.status echo "# This is the command used to configure this build" >config.status
echo $command >>config.status echo $command >>config.status
chmod u+x config.status chmod u+x config.status