From 1e82e1a1dd2319627122807e945f2974a553b759 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Tue, 5 Jul 2016 16:15:03 +0200 Subject: [PATCH] CONFIG: use ThirdParty boost, FFTW instead of system versions - many systems may not have boost or FFTW installed, or in an older version. Using ThirdParty for them should lead to a more robust build process. --- etc/config.csh/CGAL | 2 +- etc/config.csh/FFTW | 2 +- etc/config.sh/CGAL | 2 +- etc/config.sh/FFTW | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL index 5371099a251..2fd06120eb6 100644 --- a/etc/config.csh/CGAL +++ b/etc/config.csh/CGAL @@ -50,7 +50,7 @@ # #------------------------------------------------------------------------------ -set boost_version=boost-system +set boost_version=boost_1_61_0 set cgal_version=CGAL-4.8 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW index 514216e1bff..78d24e17b10 100644 --- a/etc/config.csh/FFTW +++ b/etc/config.csh/FFTW @@ -48,7 +48,7 @@ # #------------------------------------------------------------------------------ -set fftw_version=fftw-system +set fftw_version=fftw-3.3.4 setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL index afb178d709f..e23164d2c92 100644 --- a/etc/config.sh/CGAL +++ b/etc/config.sh/CGAL @@ -49,7 +49,7 @@ # - the LD_LIBRARY_PATH is not adjusted. #------------------------------------------------------------------------------ -boost_version=boost-system +boost_version=boost_1_61_0 cgal_version=CGAL-4.8 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW index 74115fccfca..7c0a48861d1 100644 --- a/etc/config.sh/FFTW +++ b/etc/config.sh/FFTW @@ -47,7 +47,7 @@ # - the LD_LIBRARY_PATH is not adjusted. #------------------------------------------------------------------------------ -fftw_version=fftw-system +fftw_version=fftw-3.3.4 export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version -- GitLab