mirror of https://github.com/CGAL/cgal
Replaced hardcoded CMAKE_VERBOSE_MAKEFILE with make VERBOSE=ON in the testsuite
This commit is contained in:
parent
dd4aadc373
commit
fd1301b7c0
|
|
@ -52,7 +52,4 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
|
||||||
|
|
||||||
set(CMAKE_COLORMAKEFILE ON)
|
set(CMAKE_COLORMAKEFILE ON)
|
||||||
|
|
||||||
# Needed by the testsuite results parser
|
|
||||||
set(CMAKE_VERBOSE_MAKEFILE ON)
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -516,7 +516,7 @@ cmake '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
|
||||||
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
|
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
|
||||||
VERBOSE=1 \\
|
VERBOSE=1 \\
|
||||||
../../..;
|
../../..;
|
||||||
${MAKE_CMD} -k -fMakefile CGAL CGAL_Core CGAL_PDB CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 ;
|
${MAKE_CMD} VERBOSE=ON -k -fMakefile CGAL CGAL_Core CGAL_PDB CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 ;
|
||||||
cd ..;
|
cd ..;
|
||||||
EOF
|
EOF
|
||||||
chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript"
|
chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript"
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ compile_and_run()
|
||||||
echo "Compiling \$1 ... "
|
echo "Compiling \$1 ... "
|
||||||
SUCCES="y"
|
SUCCES="y"
|
||||||
|
|
||||||
if eval '\${MAKE_CMD} VERBOSE=1 -fMakefile \$1' ; then
|
if eval '\${MAKE_CMD} VERBOSE=ON -fMakefile \$1' ; then
|
||||||
echo " succesful compilation of \$1" >> \$ERRORFILE
|
echo " succesful compilation of \$1" >> \$ERRORFILE
|
||||||
else
|
else
|
||||||
echo " ERROR: compilation of \$1" >> \$ERRORFILE
|
echo " ERROR: compilation of \$1" >> \$ERRORFILE
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue