Commit a3065c30 authored by Dominik Charousset's avatar Dominik Charousset

Don't write top-level Makefile when not using make

parent e0bb78cb
......@@ -134,9 +134,6 @@ configure ()
if [ -n "$5" ]; then
cmake -G "$5" $CMakeCacheEntries $sourcedir
elif [ -n "$DEFAULT_CMAKE_GENERATOR" ]; then
# parse custom environment variable
cmake -G "$DEFAULT_CMAKE_GENERATOR" $CMakeCacheEntries $sourcedir
else
cmake $CMakeCacheEntries $sourcedir
fi
......@@ -160,6 +157,11 @@ CMakeCacheEntries=""
append_cache_entry CMAKE_INSTALL_PREFIX PATH /usr/local
append_cache_entry CAF_ENABLE_RUNTIME_CHECKS BOOL false
# parse custom environment variable to initialize CMakeGenerator
if [ -n "$DEFAULT_CMAKE_GENERATOR" ]; then
CMakeGenerator="$DEFAULT_CMAKE_GENERATOR"
fi
# Parse arguments.
while [ $# -ne 0 ]; do
case "$1" in
......@@ -303,6 +305,11 @@ else
configure "$compiler" "" "$bindir" "$libdir" "$CMakeGenerator"
fi
if [ -n "$CMakeGenerator" ] && [ "$CMakeGenerator" != "Unix" ]; then
# skip Makefile-specific code below when not using make
exit 0
fi
printf "DIRS := %s\n\n" "$workdirs" > $sourcedir/Makefile
makefile=`cat <<'EOT'
all:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment