From f2925cfeca77ad44f4072a43a75806868e5263cd Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Thu, 20 Mar 2008 19:12:21 +0000 Subject: [PATCH] Workaround a problem with a clean target under cygwin+nmake --- .../developer_scripts/autotest_cgal_with_cmake | 2 +- .../developer_scripts/create_cgal_test_with_cmake | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Scripts/developer_scripts/autotest_cgal_with_cmake b/Scripts/developer_scripts/autotest_cgal_with_cmake index 6c084bc2bca..5e8b0d210fc 100755 --- a/Scripts/developer_scripts/autotest_cgal_with_cmake +++ b/Scripts/developer_scripts/autotest_cgal_with_cmake @@ -328,7 +328,7 @@ echo 'COPYING RESULTS'; cp results_${CGAL_TESTER}_${2}.tar.gz results_${CGAL_TESTER}_${2}.txt ${CGAL_TEST_DIR}; echo 'REMOVING LOCAL_TEST_DIR'; cd ..; -#rm -rf ${CGAL_BINARY_DIR}/test +rm -rf ${CGAL_BINARY_DIR}/test EOF chmod ugo+x ${CGAL_BINARY_DIR}/localtestscript.${1} remote_command ${1} "${CGAL_BINARY_DIR}/localtestscript.${1}" >> ${ACTUAL_LOGFILE}.${1} 2>&1 diff --git a/Scripts/developer_scripts/create_cgal_test_with_cmake b/Scripts/developer_scripts/create_cgal_test_with_cmake index 67c3819c88a..7c833419177 100755 --- a/Scripts/developer_scripts/create_cgal_test_with_cmake +++ b/Scripts/developer_scripts/create_cgal_test_with_cmake @@ -113,8 +113,6 @@ compile_and_run() echo " ERROR: not executed \$1" >> \$ERRORFILE fi fi - - make -fMakefile clean } EOF @@ -141,7 +139,18 @@ EOF echo " compile_and_run $tmp" fi done - echo "fi" +cat << EOF +fi + +# +# The clean target generated by CMake under cygwin +# always fails for some reason +# +if ! ( uname | grep -q "CYGWIN" ) ; then + make -fMakefile clean +fi +EOF + } echo "create_cgal_test_with_cmake version $VERSION"