From 8c744204de34e6bfa98da3806e58f7ec04513d16 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Tue, 4 Sep 2018 11:26:33 +0200
Subject: [PATCH] Compatibility: no -C option if INIT_FILE is unset or null

---
 .../test/Arrangement_on_surface_2/cgal_test_with_cmake      | 6 ++----
 CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake         | 3 +--
 Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake   | 3 +--
 .../Poisson_surface_reconstruction_3/cgal_test_with_cmake   | 3 +--
 .../Poisson_surface_reconstruction_3/cgal_test_with_cmake   | 3 +--
 Polyhedron/demo/Polyhedron/cgal_test_with_cmake             | 3 +--
 Scripts/developer_scripts/create_cgal_test                  | 1 -
 .../test/Set_movable_separability_2/cgal_test_with_cmake    | 3 +--
 Surface_sweep_2/test/Surface_sweep_2/cgal_test_base         | 3 +--
 9 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
index 0bc56422a00..7e1bec84175 100755
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
@@ -129,16 +129,14 @@ configure()
 {
   echo "Configuring... "
   rm -rf CMakeCache.txt CMakeFiles/
-  echo "cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  echo "cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
  -DCGAL_DIR=\"$CGAL_DIR\" \
- -DINIT_FILE=\"$INIT_FILE" \
  -DCGAL_CXX_FLAGS:STRING=\"$TESTSUITE_CXXFLAGS -I../../include\" \
  -DCGAL_EXE_LINKER_FLAGS=\"$TESTSUITE_LDFLAGS\" \
  -DCMAKE_BUILD_TYPE=NOTFOUND \
  ."
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                     -DCGAL_DIR="$CGAL_DIR" \
-                                    -DINIT_FILE="$INIT_FILE" \
                                     -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS -I../../include" \
                                     -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
                                     -DCMAKE_BUILD_TYPE=NOTFOUND \
diff --git a/CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake b/CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
index fb097574953..7113a52ffb8 100755
--- a/CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
+++ b/CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
@@ -26,9 +26,8 @@ configure()
 {
   echo "Configuring... "
   
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C$INIT_FILE"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
                                      
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake b/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
index 625bdffabbd..a69891eaba2 100755
--- a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
@@ -26,9 +26,8 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
 
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/cgal_test_with_cmake b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/cgal_test_with_cmake
index 8db1c729e60..f95394fe687 100755
--- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/cgal_test_with_cmake
+++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/cgal_test_with_cmake
@@ -49,9 +49,8 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
 
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/cgal_test_with_cmake b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/cgal_test_with_cmake
index ad134d433a7..61ad14fd1d6 100755
--- a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/cgal_test_with_cmake
+++ b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/cgal_test_with_cmake
@@ -49,9 +49,8 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
 
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
index 5b177843da1..0b7ad915e26 100755
--- a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
+++ b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
@@ -26,9 +26,8 @@ configure()
 {
   echo "Configuring... "
   
-  if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
                                      
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Scripts/developer_scripts/create_cgal_test b/Scripts/developer_scripts/create_cgal_test
index 9141a0d52c5..9143b7fc295 100755
--- a/Scripts/developer_scripts/create_cgal_test
+++ b/Scripts/developer_scripts/create_cgal_test
@@ -82,7 +82,6 @@ configure()
 
   if eval 'cmake -C"\$INIT_FILE" "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \\
                                      -DCGAL_DIR="\$CGAL_DIR" \\
-                                     -DINIT_FILE="\$INIT_FILE" \\
                                      --no-warn-unused-cli \\
                                      .' ; then
 
diff --git a/Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake b/Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
index 79534ffd81c..fc1dcde3929 100755
--- a/Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
+++ b/Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
@@ -26,9 +26,8 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      .' ; then
 
     echo "   successful configuration" >> $ERRORFILE
diff --git a/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base b/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
index 5671aa7a0c5..59f380da802 100755
--- a/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
+++ b/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
@@ -32,9 +32,8 @@ configure()
 
     rm CMakeCache.txt
 
-    if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
-                                     -DINIT_FILE="$INIT_FILE" \
                                      -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
                                      -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
                                      -DCMAKE_BUILD_TYPE=NOTFOUND \