COMP: add in plain lib/ directories for boost, cgal, fftw

- these directories are sometimes used for a central, non-thirdparty, non-system
  installation

- leave gmp and mpfr as is, since it is not clear how these would interact with system
  versions
This commit is contained in:
Mark Olesen
2016-11-25 20:43:27 +01:00
parent 7734d7ffd7
commit dc1c37e464
4 changed files with 12 additions and 5 deletions

View File

@ -20,5 +20,6 @@ EXE_INC = \
-I/usr/include/Qt
LIB_LIBS = \
-L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-ltriSurface

View File

@ -5,6 +5,8 @@ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude
LIB_LIBS = \
-L$(FFTW_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -lfftw3 \
-L$(FFTW_ARCH_PATH)/lib \
-L$(FFTW_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lfftw3 \
-lfiniteVolume \
-lsampling

View File

@ -5,7 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/renumber/renumberMethods/lnInclude
LIB_LIBS = \
-L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -lboost_system \
-L$(BOOST_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lboost_system \
-lmeshTools \
-ldecompositionMethods \
-lrenumberMethods

View File

@ -1,13 +1,15 @@
CGAL_INC = \
-I$(CGAL_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \
-I$(GMP_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include \
-I$(CGAL_ARCH_PATH)/include \
-I/usr/include
CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(BOOST_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lCGAL