zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Move boost and mpfr library includes from wmake/rules/general/CGAL

Browse Source 
This is so that surfaceFeatureExtract will compile without boost/mpfr
This commit is contained in:
laurence
2012-04-26 15:10:24 +01:00
parent 4190e3e5a5
commit 6a3571b3e9
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/cvMesh/Make/options
View File

@ -22,6 +22,8 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
-lboost_thread \
-lmpfr \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lmeshTools \ -lmeshTools \
-ldecompositionMethods \ -ldecompositionMethods \

2
applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
View File

@ -19,6 +19,8 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
-lboost_thread \
-lmpfr \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \ -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
-ledgeMesh \ -ledgeMesh \

2
applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
View File

@ -14,6 +14,8 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
-lboost_thread \
-lmpfr \
-L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \ -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
-lGL \ -lGL \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \

4
applications/utilities/surface/surfaceFeatureExtract/Allwmake
View File

@ -15,7 +15,9 @@ then
CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \ CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \
LAPACK_LIB=-llapack \ LAPACK_LIB=-llapack \
BLAS_LIB=-lblas \ BLAS_LIB=-lblas \
CGAL_LIB=-lCGAL" CGAL_LIB=-lCGAL \
CGAL_BOOST_LIB=-lboost_thread \
CGAL_MPFR_LIB=-lmpfr"
else else
echo echo
echo "Compiling surfaceFeatureExtract without CGAL curvature support" echo "Compiling surfaceFeatureExtract without CGAL curvature support"

2
applications/utilities/surface/surfaceFeatureExtract/Make/options
View File

@ -15,6 +15,8 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
${CGAL_BOOST_LIB} \
${CGAL_MPFR_LIB} \
${CGAL_LIBDIR} \ ${CGAL_LIBDIR} \
${LAPACK_LIB} \ ${LAPACK_LIB} \
${BLAS_LIB} \ ${BLAS_LIB} \

4
wmake/rules/General/CGAL
View File

@ -7,6 +7,4 @@ CGAL_INC = \
CGAL_LIBS = \ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \ -L$(MPFR_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib \ -L$(BOOST_ARCH_PATH)/lib
-lmpfr \
-lboost_thread