| 1 | 1. Fix include path (specified using OpenMP_CXX_INCLUDE_DIR) missing from build |
|---|
| 2 | 2. Fix "clang: warning: argument unused during compilation: '-Xclang -fopenmp' [-Wunused-command-line-argument]" |
|---|
| 3 | 3. For debugging, also show messages from OpenMP detection during configure: |
|---|
| 4 | |
|---|
| 5 | -- Found OpenMP_CXX: -Xclang -fopenmp (found suitable version "4.0", minimum required is "4.0") |
|---|
| 6 | -- Found OpenMP: TRUE (found suitable version "4.0", minimum required is "4.0") found components: CXX |
|---|
| 7 | |
|---|
| 8 | +++ CMake/VTKmDeviceAdapters.cmake.orig |
|---|
| 9 | --- CMake/VTKmDeviceAdapters.cmake |
|---|
| 10 | @@ -79,12 +79,17 @@ if(VTKm_ENABLE_TBB AND NOT TARGET vtkm::tbb) |
|---|
| 11 | |
|---|
| 12 | |
|---|
| 13 | if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) |
|---|
| 14 | - find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) |
|---|
| 15 | + find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX) |
|---|
| 16 | |
|---|
| 17 | add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) |
|---|
| 18 | + if(OpenMP_CXX_INCLUDE_DIRS) |
|---|
| 19 | + set_target_properties(vtkm::openmp PROPERTIES |
|---|
| 20 | + INTERFACE_INCLUDE_DIRECTORIES "${OpenMP_CXX_INCLUDE_DIRS}") |
|---|
| 21 | + endif() |
|---|
| 22 | if(OpenMP_CXX_FLAGS) |
|---|
| 23 | + string(REPLACE " " ";" openmp_cxx_flags_list "${OpenMP_CXX_FLAGS}") |
|---|
| 24 | set_property(TARGET vtkm::openmp |
|---|
| 25 | - APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:${OpenMP_CXX_FLAGS}>) |
|---|
| 26 | + APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:${openmp_cxx_flags_list}>) |
|---|
| 27 | |
|---|
| 28 | if(VTKm_ENABLE_CUDA) |
|---|
| 29 | string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}") |
|---|
