From 672d2134a8d6bde6328f85a097920de3ccb16d18 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Thu, 9 Jul 2015 17:37:03 +0200
Subject: [PATCH] Fix the CXXDEBUG/OpenMesh issue

---
 .../x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake  | 1 +
 .../x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/setup          | 2 +-
 Scripts/developer_scripts/autotest_cgal                   | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake

diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake
new file mode 100644
index 00000000000..762a6bc5321
--- /dev/null
+++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake
@@ -0,0 +1 @@
+set(CMAKE_DISABLE_FIND_PACKAGE_OpenMesh TRUE CACHE BOOL "Disable OpenMesh")
diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/setup b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/setup
index 82a0d497761..9423d0e44a8 100644
--- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/setup
+++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/setup
@@ -14,5 +14,5 @@ CXXFLAGS="-I$BOOST_INCLUDEDIR/include $CXXFLAGS"
 export CXXFLAGS
 
 # Workaround to pass options to cmake
-CMAKE_GENERATOR='-DCMAKE_DISABLE_FIND_PACKAGE_OpenMesh:BOOL=TRUE'
+CMAKE_GENERATOR="-C/home/lrineau/CGAL/branches/local-master.git/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/initial.cmake"
 export CMAKE_GENERATOR
diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index edf9ab8d11b..ce4cf750475 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -510,7 +510,9 @@ build_cgal_on_host()
 
         cat >> "${CGAL_BINARY_DIR}/localbuildscript" <<EOF
 CGAL_BINARY_DIR='${CGAL_BINARY_DIR}';
-CMAKE_GENERATOR='${CMAKE_GENERATOR}';
+if [ -z "\$CMAKE_GENERATOR" ]; then
+  CMAKE_GENERATOR='${CMAKE_GENERATOR}';
+fi
 MAKE_CMD='${MAKE_CMD}';
 CGAL_REFERENCE_CACHE_DIR='${CGAL_REFERENCE_CACHE_DIR}';
 export CMAKE_GENERATOR;
@@ -608,7 +610,9 @@ else
 fi
 CGAL_TEST_HOST='${HOST}';
 CGAL_TEST_PLATFORM='${PLATFORM}';
-CMAKE_GENERATOR='${CMAKE_GENERATOR}'
+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;