diff --git a/CMakeLists.txt b/CMakeLists.txt index 80909b83c0..212e55cdae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,8 @@ target_link_libraries(xtensor INTERFACE xtl) add_subdirectory(vendor/gsl-lite) # Make sure contract violations throw exceptions -target_compile_definitions(gsl-lite INTERFACE GSL_THROW_ON_CONTRACT_VIOLATION) +target_compile_definitions(gsl-lite-v1 INTERFACE GSL_THROW_ON_CONTRACT_VIOLATION) +target_compile_definitions(gsl-lite-v1 INTERFACE gsl_CONFIG_ALLOWS_NONSTRICT_SPAN_COMPARISON=1) #=============================================================================== # RPATH information @@ -345,7 +346,7 @@ endif() # target_link_libraries treats any arguments starting with - but not -l as # linker flags. Thus, we can pass both linker flags and libraries together. target_link_libraries(libopenmc ${ldflags} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} - pugixml faddeeva xtensor gsl-lite) + pugixml faddeeva xtensor gsl-lite-v1) if(dagmc) target_compile_definitions(libopenmc PRIVATE DAGMC) diff --git a/vendor/gsl-lite b/vendor/gsl-lite index 93607223a4..a5706326ed 160000 --- a/vendor/gsl-lite +++ b/vendor/gsl-lite @@ -1 +1 @@ -Subproject commit 93607223a48621dae3cedd6b3335431b38067fae +Subproject commit a5706326ed116c315c0e12b72ed39439aff2222f