Skip to content

Commit 589d7a7

Browse files
authored
Merge pull request #3285 from heplesser/fix-3283-boost
Update boost detection and issue warning message
2 parents db9722e + d857959 commit 589d7a7

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

cmake/ConfigureSummary.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,18 @@ function( NEST_PRINT_CONFIG_SUMMARY )
261261
message( "" )
262262
endif ()
263263

264+
if ( NOT HAVE_BOOST )
265+
message( "" )
266+
message( "ATTENTION!" )
267+
message( "You are about to compile NEST without the Boost Library or" )
268+
message( "your Boost Library is too old (before v1.70). This means" )
269+
message( "that a few neuron models will not be available and that" )
270+
message( "overall performance may be reduced." )
271+
message( "" )
272+
message( "--------------------------------------------------------------------------------" )
273+
message( "" )
274+
endif ()
275+
264276
message( "You can now build and install NEST with" )
265277
message( " make" )
266278
message( " make install" )

cmake/ProcessOptions.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,9 @@ function( NEST_PROCESS_WITH_GSL )
294294
set( GSL_ROOT "${with-gsl}" )
295295
endif ()
296296

297-
find_package( GSL )
297+
find_package( GSL 1.11 )
298298

299-
# only allow GSL 1.11 and later
300-
if ( GSL_FOUND AND ( "${GSL_VERSION}" VERSION_GREATER "1.11"
301-
OR "${GSL_VERSION}" VERSION_EQUAL "1.11" ))
299+
if ( GSL_FOUND )
302300
set( HAVE_GSL ON PARENT_SCOPE )
303301

304302
# export found variables to parent scope
@@ -550,7 +548,8 @@ function( NEST_PROCESS_WITH_BOOST )
550548
set(Boost_USE_RELEASE_LIBS ON) # only find release libs
551549
# Needs Boost version >=1.62.0 to use Boost sorting, JUNIT logging
552550
# Require Boost version >=1.69.0 due to change in Boost sort
553-
find_package( Boost 1.69.0 )
551+
# Require Boost version >=1.70.0 due to change in package finding
552+
find_package( Boost 1.70 CONFIG )
554553
if ( Boost_FOUND )
555554
# export found variables to parent scope
556555
set( HAVE_BOOST ON PARENT_SCOPE )

0 commit comments

Comments
 (0)