Add -C option to all `cmake` calls in the testsuite mechanism

This commit is contained in:
Maxime Gimeno 2018-08-24 14:48:55 +02:00
parent 0bc66b4c7b
commit bb14479266
11 changed files with 1776 additions and 1770 deletions

View File

@ -26,8 +26,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -26,8 +26,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -49,8 +49,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -49,8 +49,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -26,8 +26,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# ----------------------------------------------------
# ----------------------------------------------------
# autotest_cgal: a script to automagically install and
@ -525,7 +525,7 @@ export MAKE_CMD;
export CGAL_BINARY_DIR;
export CGAL_REFERENCE_CACHE_DIR;
cd '${CGAL_BINARY_DIR}';
cmake '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
cmake -C"${CGAL_REFERENCE_CACHE_DIR}/init.cmake" '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
VERBOSE=1 \\
../../..;

View File

@ -80,8 +80,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \\
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

View File

@ -26,8 +26,9 @@ configure()
{
echo "Configuring... "
if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake -C"$INIT_FILE" "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then
echo " successful configuration" >> $ERRORFILE

View File

@ -32,8 +32,9 @@ configure()
rm CMakeCache.txt
if eval 'cmake --no-warn-unused-cli "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
if eval 'cmake --no-warn-unused-cli -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 \