kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Attempt to detect a non-parallel make

Browse Source
This commit is contained in:
Andy Cedilnik 2004-09-23 07:53:42 -04:00
parent 8cb20b7052
commit 47c82a381a
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bootstrap
View File

@ -473,6 +473,7 @@ cat>"test.c"<<EOF
#include <stdio.h> #include <stdio.h>
int main(){ printf("1\n"); return 0; } int main(){ printf("1\n"); return 0; }
EOF EOF
cmake_original_make_flags="${cmake_make_flags}"
if [ "x${cmake_parallel_make}" != "x" ]; then if [ "x${cmake_parallel_make}" != "x" ]; then
cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}" cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}"
fi fi
@ -481,6 +482,17 @@ for a in ${cmake_make_processors}; do
cmake_make_processor="${a}" cmake_make_processor="${a}"
fi fi
done done
cmake_full_make_flags="${cmake_make_flags}"
if [ "x${cmake_original_make_flags}" != "x${cmake_make_flags}" ]; then
if [ -z "${cmake_make_processor}" ]; then
cmake_make_flags="${cmake_original_make_flags}"
for a in ${cmake_make_processors}; do
if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> cmake_bootstrap.log 2>&1; then
cmake_make_processor="${a}"
fi
done
fi
fi
cd "${cmake_bootstrap_dir}" cd "${cmake_bootstrap_dir}"
rm -rf "${cmake_bootstrap_dir}/${TMPFILE}" rm -rf "${cmake_bootstrap_dir}/${TMPFILE}"
@ -488,7 +500,12 @@ if [ -z "${cmake_make_processor}" ]; then
cmake_error 8 "Cannot find appropriate Makefile processor on this system. cmake_error 8 "Cannot find appropriate Makefile processor on this system.
Please specify one using environment variable MAKE." Please specify one using environment variable MAKE."
fi fi
echo "Make processor on this system is: ${cmake_make_processor}" echo "Makefile processor on this system is: ${cmake_make_processor}"
if [ "x${cmake_full_make_flags}" != "x${cmake_make_flags}" ]; then
echo "---------------------------------------------"
echo "Makefile processor ${cmake_make_processor} does not support parallel build"
echo "---------------------------------------------"
fi
# Ok, we have CC, CXX, and MAKE. # Ok, we have CC, CXX, and MAKE.