zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foamyMesh: Simplify support for system CGAL installation

Browse Source
This commit is contained in:
Henry Weller
2016-06-21 19:47:46 +01:00
parent 965e68dde0
commit 35e6c03eab
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
View File

@ -23,8 +23,7 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-IPrintTable \ -IPrintTable
-I/usr/include
LIB_LIBS = \ LIB_LIBS = \
${CGAL_LIBS} \ ${CGAL_LIBS} \

3
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
View File

@ -21,8 +21,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
-I/usr/include
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \

3
wmake/rules/General/CGAL
View File

@ -2,7 +2,8 @@ CGAL_INC = \
-I$(CGAL_ARCH_PATH)/include \ -I$(CGAL_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \ -I$(MPFR_ARCH_PATH)/include \
-I$(GMP_ARCH_PATH)/include \ -I$(GMP_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include -I$(BOOST_ARCH_PATH)/include \
-I/usr/include
CGAL_LIBS = \ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \