From 498c4c076d3f2d2f74c50eaa1ff548ccc3efa1ef Mon Sep 17 00:00:00 2001 From: Oleg Kalashev Date: Tue, 17 Sep 2024 23:31:07 +0300 Subject: [PATCH] fixing conda build on x64-linux --- src/lib/CMakeLists.txt | 4 +++- src/lib/Utils.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index e3fe5c1..79e3182 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -52,6 +52,8 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") FIND_LIBRARY(C_LIBRARY c) FIND_LIBRARY(GSL_LIBRARY gsl) FIND_LIBRARY(GSLCBLAS_LIBRARY gslcblas) +FIND_LIBRARY(BOOST_FS_LIBRARY boost_filesystem) +FIND_LIBRARY(BOOST_SYS_LIBRARY boost_system) set(SOURCE_FILES ../external/SOPHIA/eventgen.f @@ -132,6 +134,6 @@ add_link_options(-fopenmp) add_library(mcray ${SOURCE_FILES}) add_executable(mcray_test ExampleUserMain.cpp) add_executable(z2t z2t.cpp) -target_link_libraries(mcray gfortran ${C_LIBRARY} ${GSL_LIBRARY} ${GSLCBLAS_LIBRARY}) +target_link_libraries(mcray gfortran ${C_LIBRARY} ${GSL_LIBRARY} ${GSLCBLAS_LIBRARY} ${BOOST_SYS_LIBRARY} ${BOOST_FS_LIBRARY} ${CMAKE_DL_LIBS}) target_link_libraries(mcray_test mcray) target_link_libraries(z2t mcray) diff --git a/src/lib/Utils.cpp b/src/lib/Utils.cpp index 556707a..b71b5f7 100644 --- a/src/lib/Utils.cpp +++ b/src/lib/Utils.cpp @@ -28,9 +28,11 @@ #include "Utils.h" #include +#define BOOST_NO_CXX11_SCOPED_ENUMS #include #include #include +#undef BOOST_NO_CXX11_SCOPED_ENUMS #include namespace fs = boost::filesystem;