mirror of https://github.com/CGAL/cgal
Fix the CXXDEBUG/OpenMesh issue
This commit is contained in:
parent
e7563d3e05
commit
672d2134a8
|
|
@ -0,0 +1 @@
|
||||||
|
set(CMAKE_DISABLE_FIND_PACKAGE_OpenMesh TRUE CACHE BOOL "Disable OpenMesh")
|
||||||
|
|
@ -14,5 +14,5 @@ CXXFLAGS="-I$BOOST_INCLUDEDIR/include $CXXFLAGS"
|
||||||
export CXXFLAGS
|
export CXXFLAGS
|
||||||
|
|
||||||
# Workaround to pass options to cmake
|
# 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
|
export CMAKE_GENERATOR
|
||||||
|
|
|
||||||
|
|
@ -510,7 +510,9 @@ build_cgal_on_host()
|
||||||
|
|
||||||
cat >> "${CGAL_BINARY_DIR}/localbuildscript" <<EOF
|
cat >> "${CGAL_BINARY_DIR}/localbuildscript" <<EOF
|
||||||
CGAL_BINARY_DIR='${CGAL_BINARY_DIR}';
|
CGAL_BINARY_DIR='${CGAL_BINARY_DIR}';
|
||||||
CMAKE_GENERATOR='${CMAKE_GENERATOR}';
|
if [ -z "\$CMAKE_GENERATOR" ]; then
|
||||||
|
CMAKE_GENERATOR='${CMAKE_GENERATOR}';
|
||||||
|
fi
|
||||||
MAKE_CMD='${MAKE_CMD}';
|
MAKE_CMD='${MAKE_CMD}';
|
||||||
CGAL_REFERENCE_CACHE_DIR='${CGAL_REFERENCE_CACHE_DIR}';
|
CGAL_REFERENCE_CACHE_DIR='${CGAL_REFERENCE_CACHE_DIR}';
|
||||||
export CMAKE_GENERATOR;
|
export CMAKE_GENERATOR;
|
||||||
|
|
@ -608,7 +610,9 @@ else
|
||||||
fi
|
fi
|
||||||
CGAL_TEST_HOST='${HOST}';
|
CGAL_TEST_HOST='${HOST}';
|
||||||
CGAL_TEST_PLATFORM='${PLATFORM}';
|
CGAL_TEST_PLATFORM='${PLATFORM}';
|
||||||
CMAKE_GENERATOR='${CMAKE_GENERATOR}'
|
if [ -z "\$CMAKE_GENERATOR" ]; then
|
||||||
|
CMAKE_GENERATOR='${CMAKE_GENERATOR}';
|
||||||
|
fi
|
||||||
MAKE_CMD='${MAKE_CMD}'
|
MAKE_CMD='${MAKE_CMD}'
|
||||||
export CGAL_TESTER CGAL_TESTER_NAME CGAL_TESTER_ADDRESS;
|
export CGAL_TESTER CGAL_TESTER_NAME CGAL_TESTER_ADDRESS;
|
||||||
export CGAL_DIR;
|
export CGAL_DIR;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue