From 88b9a2f42f8cfd62a311b79e4f869b15e7889585 Mon Sep 17 00:00:00 2001 From: Yohann Vautrin <135177-YVautrin@users.noreply.gitlab.kitware.com> Date: Tue, 23 Apr 2024 15:51:29 -0400 Subject: [PATCH] Update OpenMP code for consistency Calls to `set_property` are replaced by equivalents calls for readability. Order of operations is changed for consistency with the code for TBB. --- CMake/VTKmDeviceAdapters.cmake | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake index aae091338..d2519ea17 100644 --- a/CMake/VTKmDeviceAdapters.cmake +++ b/CMake/VTKmDeviceAdapters.cmake @@ -58,21 +58,13 @@ if(VTKm_ENABLE_OPENMP AND NOT (TARGET vtkm_openmp OR TARGET vtkm::openmp)) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) add_library(vtkm_openmp INTERFACE) + target_link_libraries(vtkm_openmp INTERFACE OpenMP::OpenMP_CXX) + target_compile_options(vtkm_openmp INTERFACE $<$:${OpenMP_CXX_FLAGS}>) + if(VTKm_ENABLE_CUDA) + string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}") + target_compile_options(vtkm_openmp INTERFACE $<$:${openmp_cuda_flags}>) + endif() set_target_properties(vtkm_openmp PROPERTIES EXPORT_NAME openmp) - if(OpenMP_CXX_FLAGS) - set_property(TARGET vtkm_openmp - APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${OpenMP_CXX_FLAGS}>) - - if(VTKm_ENABLE_CUDA) - string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}") - set_property(TARGET vtkm_openmp - APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${openmp_cuda_flags}>) - endif() - endif() - if(OpenMP_CXX_LIBRARIES) - set_target_properties(vtkm_openmp PROPERTIES - INTERFACE_LINK_LIBRARIES OpenMP::OpenMP_CXX) - endif() install(TARGETS vtkm_openmp EXPORT ${VTKm_EXPORT_NAME}) endif()