diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-12-16 08:32:24 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-12-16 08:32:24 +0000 |
| commit | 1cd180ad716de10266059bda796bd6e7912fafde (patch) | |
| tree | 95215d437ca044244ce4e1f43e6885ecca1db00d /math/combblas/files | |
| parent | multimedia/aom: adjust COMMENT in relation to dav1d/rav1e (diff) | |
math/combblas: Fix the OpenMP dependency
Remove 'find_package(OpenMP)' and llvm/clang70 because
'find_package(OpenMP)' is now broken with clang70 too.
Fix the problem by patching out 'find_package(OpenMP)'.
See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234050
Diffstat (limited to 'math/combblas/files')
| -rw-r--r-- | math/combblas/files/patch-CMakeLists.txt | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/math/combblas/files/patch-CMakeLists.txt b/math/combblas/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..052ff9fee6fd --- /dev/null +++ b/math/combblas/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2018-12-16 07:56:08 UTC ++++ CMakeLists.txt +@@ -23,7 +23,11 @@ target_include_directories(CombBLAS PRIV + + # MPI and OpenMP dependencies + find_package(MPI REQUIRED) +-find_package(OpenMP REQUIRED) ++#find_package(OpenMP REQUIRED) ++set(OPENMP_FOUND TRUE) ++set(OpenMP_CXX_FOUND TRUE) ++set(OpenMP_CXX_FLAGS "") ++set(OpenMP_LINK_FLAGS "-lomp") + + if(TARGET MPI::MPI_CXX) # Use target if available (cmake >= 3.9) + target_link_libraries(CombBLAS PUBLIC MPI::MPI_CXX) +@@ -40,7 +44,7 @@ if(OPENMP_FOUND OR OpenMP_CXX_FOUND) + target_link_libraries(CombBLAS PUBLIC OpenMP::OpenMP_CXX) + else() + target_compile_options(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") +- target_link_libraries(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}") ++ target_link_libraries(CombBLAS PUBLIC "${OpenMP_LINK_FLAGS}") + endif() + endif() + |