cmake: configure defaults to ninja, support -developer-mode
This makes -developer-mode build tests and examples, too. Change-Id: I3f1a700c6e9d06ab632990561e13f059acb4e6ff Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
2cf0ba1fba
commit
37756ede09
20
configure
vendored
20
configure
vendored
@ -120,6 +120,21 @@ set -f # suppress globbing in for loop
|
|||||||
SAVED_IFS=$IFS
|
SAVED_IFS=$IFS
|
||||||
IFS='
|
IFS='
|
||||||
'
|
'
|
||||||
|
|
||||||
|
if [ "$CFG_DEV" = "yes" ]; then
|
||||||
|
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
||||||
|
-DFEATURE_developer_build=ON"
|
||||||
|
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
||||||
|
-DBUILD_TESTING=ON"
|
||||||
|
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
||||||
|
-DBUILD_EXAMPLES=ON"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CMAKE_MAKEFILES" = "no" ]; then
|
||||||
|
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
||||||
|
-G Ninja"
|
||||||
|
fi
|
||||||
|
|
||||||
for i in "$@"; do
|
for i in "$@"; do
|
||||||
if [ "$PASSTHRU" = "yes" ]; then
|
if [ "$PASSTHRU" = "yes" ]; then
|
||||||
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
CMAKE_CMDLINE="$CMAKE_CMDLINE
|
||||||
@ -432,6 +447,7 @@ OPT_HELP=
|
|||||||
CFG_SILENT=no
|
CFG_SILENT=no
|
||||||
CFG_DEV=no
|
CFG_DEV=no
|
||||||
BUILD_WITH_CMAKE=no
|
BUILD_WITH_CMAKE=no
|
||||||
|
CMAKE_MAKEFILES=no
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# parse command line arguments
|
# parse command line arguments
|
||||||
@ -587,6 +603,10 @@ while [ "$#" -gt 0 ]; do
|
|||||||
cmake)
|
cmake)
|
||||||
BUILD_WITH_CMAKE=yes
|
BUILD_WITH_CMAKE=yes
|
||||||
;;
|
;;
|
||||||
|
cmake-makefiles)
|
||||||
|
BUILD_WITH_CMAKE=yes
|
||||||
|
CMAKE_MAKEFILES=yes
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
x
Reference in New Issue
Block a user