songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compatibility: no -C option if INIT_FILE is unset or null

This commit is contained in:
Laurent Rineau 2018-09-04 11:26:33 +02:00
parent bb14479266
commit 8c744204de
9 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
View File

@ -129,16 +129,14 @@ configure()
{ {
echo "Configuring... " echo "Configuring... "
rm -rf CMakeCache.txt CMakeFiles/ 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\" \ -DCGAL_DIR=\"$CGAL_DIR\" \
-DINIT_FILE=\"$INIT_FILE" \
-DCGAL_CXX_FLAGS:STRING=\"$TESTSUITE_CXXFLAGS -I../../include\" \ -DCGAL_CXX_FLAGS:STRING=\"$TESTSUITE_CXXFLAGS -I../../include\" \
-DCGAL_EXE_LINKER_FLAGS=\"$TESTSUITE_LDFLAGS\" \ -DCGAL_EXE_LINKER_FLAGS=\"$TESTSUITE_LDFLAGS\" \
-DCMAKE_BUILD_TYPE=NOTFOUND \ -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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
-DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS -I../../include" \ -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS -I../../include" \
-DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \ -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
-DCMAKE_BUILD_TYPE=NOTFOUND \ -DCMAKE_BUILD_TYPE=NOTFOUND \

3
CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
View File

@ -26,9 +26,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

3
Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
View File

@ -26,9 +26,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

3
Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/cgal_test_with_cmake
View File

@ -49,9 +49,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

3
Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/cgal_test_with_cmake
View File

@ -49,9 +49,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

3
Polyhedron/demo/Polyhedron/cgal_test_with_cmake
View File

@ -26,9 +26,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

1
Scripts/developer_scripts/create_cgal_test
View File

@ -82,7 +82,6 @@ configure()
if eval 'cmake -C"\$INIT_FILE" "\$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

3
Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
View File

@ -26,9 +26,8 @@ configure()
{ {
echo "Configuring... " 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" \ -DCGAL_DIR="$CGAL_DIR" \
-DINIT_FILE="$INIT_FILE" \
.' ; then .' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

3
Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
View File

@ -32,9 +32,8 @@ configure()
rm CMakeCache.txt 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" \ -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 \