diff --git a/CMake/Packages.cmake b/CMake/Packages.cmake index 4ff4117ef8d085e9c0c22859624912ae47b65d8e..7ad5dd5219d89f7ae3a8cc104721b8531ad8de98 100644 --- a/CMake/Packages.cmake +++ b/CMake/Packages.cmake @@ -78,6 +78,7 @@ endif() if(VF_ENABLE_OPENMP) find_package(OpenMP REQUIRED) + target_compile_definitions(project_options INTERFACE VF_OPENMP) endif() # TODO: https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/139 if(VF_ENABLE_MPI) diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt index e0a31260cef2d387dac61bb653df2de4af48f123..bfd39f8a1473787affea347aec68c67adad6516b 100644 --- a/src/basics/CMakeLists.txt +++ b/src/basics/CMakeLists.txt @@ -34,7 +34,7 @@ include(MetaData/buildInfo.cmake) -vf_add_library(PUBLIC_LINK logger yaml-cpp::yaml-cpp EXCLUDE buildInfo.in.cpp PRIVATE_LINK project_options project_warnings) +vf_add_library(PUBLIC_LINK logger yaml-cpp::yaml-cpp OpenMP::OpenMP_CXX EXCLUDE buildInfo.in.cpp PRIVATE_LINK project_options project_warnings) vf_get_library_name (library_name) diff --git a/src/basics/MetaData/MetaData.cpp b/src/basics/MetaData/MetaData.cpp index a020f50e079cfd82785a433b41e0f97ec7609775..5fd125e0fed13c909ddf1a397195375c2acbec22 100644 --- a/src/basics/MetaData/MetaData.cpp +++ b/src/basics/MetaData/MetaData.cpp @@ -63,7 +63,7 @@ MetaData::MetaData() buildInfo.mpi_library = buildInfo::mpi_library(); buildInfo.mpi_version = buildInfo::mpi_version(); #endif -#ifdef _OPENMP +#ifdef VF_OPENMP buildInfo.openmp_library = buildInfo::openmp_library(); buildInfo.openmp_version = buildInfo::openmp_version(); #endif diff --git a/src/basics/MetaData/MetaData.h b/src/basics/MetaData/MetaData.h index 8f3cfb9783f65775800bbfe406d2d44479040fb0..7d426dae4eb9cda83e7471cd02ba77622992456f 100644 --- a/src/basics/MetaData/MetaData.h +++ b/src/basics/MetaData/MetaData.h @@ -97,7 +97,7 @@ struct MetaData std::string mpi_library; std::string mpi_version; #endif -#ifdef _OPENMP +#ifdef VF_OPENMP std::string openmp_library; std::string openmp_version; #endif diff --git a/src/basics/MetaData/YAML_MetaData.cpp b/src/basics/MetaData/YAML_MetaData.cpp index 6ccac6420ac32892b5313abfd84eda35e73ce9bc..fd7012dc16142f5f7e7ae634568e8ab5d1b450dc 100644 --- a/src/basics/MetaData/YAML_MetaData.cpp +++ b/src/basics/MetaData/YAML_MetaData.cpp @@ -61,7 +61,7 @@ struct convert<vf::basics::MetaData::BuildInfo> root["mpi_library"] = rhs.mpi_library; root["mpi_version"] = rhs.mpi_version; #endif -#ifdef _OPENMP +#ifdef VF_OPENMP root["openmp_library"] = rhs.openmp_library; root["openmp_version"] = rhs.openmp_version; #endif diff --git a/src/basics/MetaData/buildInfo.h b/src/basics/MetaData/buildInfo.h index 18a6b820b15d64a88d1f275c78c4647baf5211e3..dc5f31ba9121c7c9388ef1112ab19a7f20e5bda1 100644 --- a/src/basics/MetaData/buildInfo.h +++ b/src/basics/MetaData/buildInfo.h @@ -53,7 +53,7 @@ const char* compiler_version(); const char* mpi_library(); const char* mpi_version(); #endif -#ifdef _OPENMP +#ifdef VF_OPENMP const char* openmp_library(); const char* openmp_version(); #endif diff --git a/src/basics/MetaData/buildInfo.in.cpp b/src/basics/MetaData/buildInfo.in.cpp index 1d406a303baf283c437364f9553c9a0b118af0b7..dccf45a11f6200cf56b1e2f0bdbf59682afe2402 100644 --- a/src/basics/MetaData/buildInfo.in.cpp +++ b/src/basics/MetaData/buildInfo.in.cpp @@ -107,7 +107,7 @@ const char* mpi_version() } #endif -#ifdef _OPENMP +#ifdef VF_OPENMP const char* openmp_library() { return "@OpenMP_CXX_LIBRARIES@"; diff --git a/src/gpu/core/CMakeLists.txt b/src/gpu/core/CMakeLists.txt index 8579017488b15d3190b3215d2a0da7adc32a2025..20185e287afc546e3a0deaf1eb918be015bfac21 100644 --- a/src/gpu/core/CMakeLists.txt +++ b/src/gpu/core/CMakeLists.txt @@ -34,7 +34,7 @@ project(gpu_core LANGUAGES CUDA CXX) -vf_add_library(NAME gpu_core PUBLIC_LINK basics lbm parallel logger GridGenerator project_options project_warnings PRIVATE_LINK cuda_helper OpenMP::OpenMP_CXX) +vf_add_library(NAME gpu_core PUBLIC_LINK basics lbm parallel logger GridGenerator OpenMP::OpenMP_CXX project_options project_warnings PRIVATE_LINK cuda_helper) #SET(TPN_WIN32 "/EHsc") #https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake