songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a typo, and make jom really work: we cannot specify targets that do not exist.

This commit is contained in:
Laurent Rineau 2010-06-23 11:12:32 +00:00
parent 09f3e63a51
commit d659043fa2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Scripts/developer_scripts/autotest_cgal
View File

@ -525,7 +525,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} VERBOSE=ON -k -fMakefile CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 ; ${MAKE_CMD} VERBOSE=ON -k -fMakefile ;
cd ..; cd ..;
EOF EOF
chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript" chmod ugo+x "${CGAL_BINARY_DIR}/localbuildscript"
@ -854,14 +854,15 @@ fi
# Detects cygwin # Detects cygwin
if uname | grep -q "CYGWIN"; then if uname | grep -q "CYGWIN"; then
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
JOM="`which jom`" JOM="`which jom`"
if [ -e "$JOM" ]; then if [ -e "$JOM" ]; then
CMAKE_GENERATOR="-GNMake Makefiles JOM' CMAKE_GENERATOR='-GNMake Makefiles JOM'
MAKE_CMD='jom' MAKE_CMD='jom'
log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
else else
CMAKE_GENERATOR='-GNMake Makefiles' CMAKE_GENERATOR='-GNMake Makefiles'
MAKE_CMD='nmake' MAKE_CMD='nmake'
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
fi fi
IS_CYGWIN='y' IS_CYGWIN='y'
else else