Merge pull request #6535 from sloriot/Test-remove_cmake_generator

remove mentions to  CMAKE_GENERATOR in test scripts

# Conflicts:
#	CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
#	Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake

Scripts/developer_scripts/autotest_cgal

@@ -80,7 +80,6 @@ REFERENCE_PLATFORMS_DIR="must_be_set_in_.autocgalrc"
 ACTUAL_DIR=`pwd`
 RSH="rsh"
 NICE_OPTIONS="-19"
-CMAKE_GENERATOR=""
 USE_TARGZ="n"
 USE_TARBZ="n"
 PLATFORMS=""
@@ -506,16 +505,12 @@ build_cgal_on_host()
 
         cat >> "${CGAL_BINARY_DIR}/localbuildscript" <<EOF
 CGAL_BINARY_DIR='${CGAL_BINARY_DIR}';
-if [ -z "\$CMAKE_GENERATOR" ]; then
-  CMAKE_GENERATOR='${CMAKE_GENERATOR}';
-fi
 MAKE_CMD='${MAKE_CMD}';
 
-export CMAKE_GENERATOR;
 export MAKE_CMD;
 export CGAL_BINARY_DIR;
 cd '${CGAL_BINARY_DIR}';
-cmake \${INIT_FILE:+"-C\${INIT_FILE}"} '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
+cmake \${INIT_FILE:+"-C\${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE \\
                            VERBOSE=1 \\
                            ../../..;
 ${MAKE_CMD} VERBOSE=ON -k -fMakefile  ;
@@ -604,14 +599,10 @@ else
 fi
 CGAL_TEST_HOST='${HOST}';
 CGAL_TEST_PLATFORM='${PLATFORM}';
-if [ -z "\$CMAKE_GENERATOR" ]; then
-  CMAKE_GENERATOR='${CMAKE_GENERATOR}';
-fi
 MAKE_CMD='${MAKE_CMD}'
 export CGAL_TESTER CGAL_TESTER_NAME CGAL_TESTER_ADDRESS;
 export CGAL_DIR;
 export CGAL_TEST_HOST CGAL_TEST_PLATFORM;
-export CMAKE_GENERATOR;
 export MAKE_CMD;
 
 EOF
@@ -884,43 +875,6 @@ else
   done
 fi
 
-# Detects cygwin
-if uname | grep -q "CYGWIN"; then
-  JOM="`which jom`"
-  if [ -e "$JOM" ]; then
-    CMAKE_GENERATOR='-GNMake Makefiles JOM'
-    MAKE_CMD='jom'
-    log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
-  else
-    CMAKE_GENERATOR='-GNMake Makefiles'
-    MAKE_CMD='nmake'
-    log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
-  fi
-  IS_CYGWIN='y'
-else
-  log "${ACTUAL_LOGFILE}" "Non-cygwin linux detected, using system make."
-  MAKE_CMD='make'
-fi
-
-if [ -z "$IS_CYGWIN" ]; then
-
-# Acquire lock
-lockfile -r 1 "$LOCK_FILE";
-if [ ${?} != 0 ]; then
-  PID=`cat "$LOCK_FILE"`
-  if kill -0 "$PID"; then
-    log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
-    exit 1;
-  else
-    # The locking process has died without erasing the lock file
-    rm -f "$LOCK_FILE"
-    lockfile -r 1 "$LOCK_FILE";
-    if [ ${?} != 0 ]; then
-      log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK!";
-      exit 1
-    fi
-  fi
-fi
 # Make that file writable (lockfile create read-only files
 chmod u+w "$LOCK_FILE"
 # Put the PID of current process in the lock file

Scripts/developer_scripts/create_cgal_test

@@ -80,7 +80,7 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
                                      --no-warn-unused-cli \
                                      .' ; then