mirror of https://github.com/CGAL/cgal
Add -C option to all `cmake` calls in the testsuite mechanism
This commit is contained in:
parent
0bc66b4c7b
commit
bb14479266
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -26,8 +26,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
# autotest_cgal: a script to automagically install and
|
# autotest_cgal: a script to automagically install and
|
||||||
|
|
@ -525,7 +525,7 @@ export MAKE_CMD;
|
||||||
export CGAL_BINARY_DIR;
|
export CGAL_BINARY_DIR;
|
||||||
export CGAL_REFERENCE_CACHE_DIR;
|
export CGAL_REFERENCE_CACHE_DIR;
|
||||||
cd '${CGAL_BINARY_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" \\
|
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
|
||||||
VERBOSE=1 \\
|
VERBOSE=1 \\
|
||||||
../../..;
|
../../..;
|
||||||
|
|
|
||||||
|
|
@ -80,8 +80,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \\
|
-DCGAL_DIR="\$CGAL_DIR" \\
|
||||||
|
-DINIT_FILE="\$INIT_FILE" \\
|
||||||
--no-warn-unused-cli \\
|
--no-warn-unused-cli \\
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,9 @@ configure()
|
||||||
{
|
{
|
||||||
echo "Configuring... "
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
.' ; then
|
.' ; then
|
||||||
|
|
||||||
echo " successful configuration" >> $ERRORFILE
|
echo " successful configuration" >> $ERRORFILE
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,9 @@ configure()
|
||||||
|
|
||||||
rm CMakeCache.txt
|
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" \
|
-DCGAL_DIR="$CGAL_DIR" \
|
||||||
|
-DINIT_FILE="$INIT_FILE" \
|
||||||
-DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
|
-DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
|
||||||
-DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
|
-DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
|
||||||
-DCMAKE_BUILD_TYPE=NOTFOUND \
|
-DCMAKE_BUILD_TYPE=NOTFOUND \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue