fixing conda build on x64-linux

okolo · Sep 17, 2024 · 498c4c0 · 498c4c0
1 parent 1dd07c0
commit 498c4c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -28,9 +28,11 @@
 
 #include "Utils.h"
 #include <omp.h>
+#define BOOST_NO_CXX11_SCOPED_ENUMS
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/dll.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include <sstream>
 namespace fs = boost::filesystem;