From 0c8bbf0a15260ff011a306406e2ff69dff7db3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= Date: Tue, 17 Dec 2024 22:57:50 +0100 Subject: [PATCH] fixup --- CMakeLists.txt | 6 ++++-- doc/sphinx/running.rst | 2 +- src/core/unit_tests/EspressoSystemStandAlone_test.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56ee802a0c..a03a4dfe61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -686,16 +686,18 @@ if(ESPRESSO_BUILD_WITH_WALBERLA) walberla::core walberla::domain_decomposition walberla::blockforest walberla::boundary walberla::field walberla::lbm walberla::timeloop walberla::vtk) - if(ESPRESSO_BUILD_WITH_WALBERLA_FFT) + if(WALBERLA_BUILD_WITH_FFTW) set(WALBERLA_LIBS ${WALBERLA_LIBS} walberla::fft) endif() - if(ESPRESSO_BUILD_WITH_CUDA AND WALBERLA_BUILD_WITH_CUDA) + if(WALBERLA_BUILD_WITH_CUDA) set(WALBERLA_LIBS ${WALBERLA_LIBS} walberla::gpu) endif() # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/21283 foreach(target_w_namespace IN LISTS WALBERLA_LIBS) string(REPLACE "walberla::" "" target_wo_namespace ${target_w_namespace}) add_library(${target_w_namespace} ALIAS ${target_wo_namespace}) + install(TARGETS ${target_wo_namespace} + LIBRARY DESTINATION ${ESPRESSO_INSTALL_PYTHON}/espressomd) endforeach() if(ESPRESSO_BUILD_WITH_WALBERLA_AVX) function(espresso_avx_flags_callback COMPILER_AVX2_FLAG) diff --git a/doc/sphinx/running.rst b/doc/sphinx/running.rst index 2ab5ebaf66..bc4eb4823b 100644 --- a/doc/sphinx/running.rst +++ b/doc/sphinx/running.rst @@ -769,7 +769,7 @@ FPE .. note:: Requires specific compiler and linker flags, enabled with the CMake option - ``-D ESPRESSO_BUILD_WITH_FPE=ON -D CMAKE_BUILD_TYPE=RelWithDebInfo``. + ``-D ESPRESSO_BUILD_WITH_FPE=ON -D CMAKE_BUILD_TYPE=Debug``. When abnormal mathematical operations take place at runtime, for example divisions by zero, multiplication of infinity with zero, diff --git a/src/core/unit_tests/EspressoSystemStandAlone_test.cpp b/src/core/unit_tests/EspressoSystemStandAlone_test.cpp index bbc0e4bbe4..ab489668f0 100644 --- a/src/core/unit_tests/EspressoSystemStandAlone_test.cpp +++ b/src/core/unit_tests/EspressoSystemStandAlone_test.cpp @@ -97,7 +97,7 @@ BOOST_FIXTURE_TEST_CASE(espresso_system_stand_alone, ParticleFactory) { auto const comm = boost::mpi::communicator(); auto const rank = comm.rank(); auto const n_nodes = comm.size(); -#ifdef FPE +#if defined(FPE) and not defined (__APPLE__) auto const trap = fe_trap::make_unique_scoped(); #endif