Skip to content
Snippets Groups Projects
Commit 3d5b6664 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[CMake] Make CMake the default buildsystem.

parent 5cefba4b
No related branches found
No related tags found
No related merge requests found
......@@ -172,6 +172,10 @@ load_opts() {
if test -n "$OPTS_FILE_USE_CMAKE"; then
USE_CMAKE="$OPTS_FILE_USE_CMAKE"
fi
# if still no USE_CMAKE is set, default to true
if test -z "$USE_CMAKE"; then
USE_CMAKE="yes"
fi
fi
if test -n "$USE_CMAKE" && test -z "$CMAKE"; then
# We use cmake for building, but CMAKE is not yet set.
......@@ -581,7 +585,7 @@ run_default_update () {
}
run_default_autogen () {
if test "x$USE_CMAKE" != "xyes" || test ! -e "$(eval "echo \$PATH_$module")/CMakeLists.txt" ; then
if test "x$USE_CMAKE" = "xno" || test ! -e "$(eval "echo \$PATH_$module")/CMakeLists.txt" ; then
PARAMS="$CMD_FLAGS"
local M4_PATH=""
if test -f configure.ac && \
......@@ -608,7 +612,7 @@ run_default_autogen () {
run_default_configure () {
extract_multiarch
PARAMS="$CMD_FLAGS"
if test "x$USE_CMAKE" = "xyes" && test -e "$(eval "echo \$PATH_$module")/CMakeLists.txt"; then
if test "x$USE_CMAKE" != "xno" && test -e "$(eval "echo \$PATH_$module")/CMakeLists.txt"; then
LOCAL_USE_CMAKE=yes
else
LOCAL_USE_CMAKE=no
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment