Skip to content

Commit 16cf03a

Browse files
committed
Fixed build to find recent boost (without relying on tr1 file)
1 parent 79f268d commit 16cf03a

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

base/SAMRAI/SAMRAI/config/samrai_boost.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ case "$with_boost" in
1818
# BOOST header files are there.
1919
AC_MSG_CHECKING([for BOOST installation])
2020
for dir in /usr /usr/local; do
21-
if test -f ${dir}/include/boost/tr1/unordered_map.hpp; then
21+
if test -f ${dir}/include/boost/random/normal_distribution.hpp; then
2222
boost_PREFIX=${dir}
2323
break
2424
fi
@@ -29,7 +29,7 @@ case "$with_boost" in
2929
# BOOST install path was specified.
3030
AC_MSG_CHECKING([for BOOST installation])
3131
32-
if test -f ${with_boost}/include/boost/tr1/unordered_map.hpp; then
32+
if test -f ${with_boost}/include/boost/random/normal_distribution.hpp; then
3333
boost_PREFIX=$with_boost
3434
boost_INCLUDES="-I${boost_PREFIX}/include"
3535
dnl Do not have to set boost_LIBS because SAMRAI does not need it (yet).

base/SAMRAI/SAMRAI/configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -17781,7 +17781,7 @@ case "$with_boost" in
1778117781
{ $as_echo "$as_me:$LINENO: checking for BOOST installation" >&5
1778217782
$as_echo_n "checking for BOOST installation... " >&6; }
1778317783
for dir in /usr /usr/local; do
17784-
if test -f ${dir}/include/boost/tr1/unordered_map.hpp; then
17784+
if test -f ${dir}/include/boost/random/normal_distribution.hpp; then
1778517785
boost_PREFIX=${dir}
1778617786
break
1778717787
fi
@@ -17794,7 +17794,7 @@ $as_echo "$boost_PREFIX" >&6; }
1779417794
{ $as_echo "$as_me:$LINENO: checking for BOOST installation" >&5
1779517795
$as_echo_n "checking for BOOST installation... " >&6; }
1779617796

17797-
if test -f ${with_boost}/include/boost/tr1/unordered_map.hpp; then
17797+
if test -f ${with_boost}/include/boost/random/normal_distribution.hpp; then
1779817798
boost_PREFIX=$with_boost
1779917799
boost_INCLUDES="-I${boost_PREFIX}/include"
1780017800
{ $as_echo "$as_me:$LINENO: result: $boost_PREFIX" >&5

config/support-boost.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ case "$with_boost" in
1818
# BOOST header files are there.
1919
AC_MSG_CHECKING([for BOOST installation])
2020
for dir in /usr /usr/local; do
21-
if test -f ${dir}/include/boost/tr1/unordered_map.hpp; then
21+
if test -f ${dir}/include/boost/random/normal_distribution.hpp; then
2222
boost_PREFIX=${dir}
2323
break
2424
fi
@@ -29,7 +29,7 @@ case "$with_boost" in
2929
# BOOST install path was specified.
3030
AC_MSG_CHECKING([for BOOST installation])
3131
32-
if test -f ${with_boost}/include/boost/tr1/unordered_map.hpp; then
32+
if test -f ${with_boost}/include/boost/random/normal_distribution.hpp; then
3333
boost_PREFIX=$with_boost
3434
boost_INCLUDES="-I${boost_PREFIX}/include"
3535
dnl Do not have to set boost_LIBS because SAMRAI does not need it (yet).

scripts/doconfig_cades_gnu_dbg

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/sh
2-
module purge
32
module load PE-gnu
43
module load hdf5
54
module load netcdf
65
module load hypre
7-
module load boost/1.61.0
6+
module load boost
87

98
./configure --enable-debug \
109
--with-CXX=mpiCC \

scripts/doconfig_cades_gnu_opt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/sh
2-
module purge
32
module load PE-gnu
43
module load hdf5
54
module load netcdf
65
module load hypre
7-
module load boost/1.61.0
6+
module load boost
87

98
./configure --disable-debug --enable-opt \
109
--with-CXX=mpiCC \

0 commit comments

Comments
 (0)