mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
COMP: Newer CGAL versions break current CGAL wmake rules (issue #288)
On 64-bit systems, the system installations of boost, cgal are under
lib64/. The behaviour for a ThirdParty build is mostly lib/ but this
can also be changing.
Boost 1_62_0 and older build into 'lib/'.
CGAL-4.9 builds into 'lib64/', older versions into 'lib/'.
Future-proof things by using lib$WM_COMPILER_LIB_ARCH for boost and
cgal build rules, and forcing these as build targets in the ThirdParty
makeCGAL as well.
--
STYLE: check for boost/version.hpp, CGAL/version.h instead their directories
This commit is contained in:
@ -4,8 +4,8 @@ set -x
|
||||
|
||||
unset COMPILE_FLAGS LINK_FLAGS
|
||||
|
||||
if [ -d "$CGAL_ARCH_PATH/include/CGAL" ] || \
|
||||
[ "${CGAL_ARCH_PATH##*-}" = system -a -d /usr/include/CGAL ]
|
||||
if [ -f "$CGAL_ARCH_PATH/include/CGAL/version.h" ] || \
|
||||
[ "${CGAL_ARCH_PATH##*-}" = system -a -f /usr/include/CGAL/version.h ]
|
||||
then
|
||||
wmake PolyhedronReader
|
||||
export COMPILE_FLAGS='-IPolyhedronReader'
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
EXE_NDEBUG = -DNDEBUG
|
||||
/* EXE_NDEBUG = -g -O0 -DFULLDEBUG */
|
||||
|
||||
|
||||
c++CGALWARN = -Wno-old-style-cast
|
||||
|
||||
/*-- Define CGAL_INEXACT to use inexact CGAL constructions */
|
||||
@ -21,5 +20,5 @@ EXE_INC = \
|
||||
-I/usr/include/Qt
|
||||
|
||||
LIB_LIBS = \
|
||||
-L${CGAL_ARCH_PATH}/lib \
|
||||
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
|
||||
-ltriSurface
|
||||
|
||||
Reference in New Issue
Block a user