diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-15 21:43:57 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-15 21:43:57 +0000 |
| commit | 29caeeebb58c3224b7a8244f21b00bfac0698f29 (patch) | |
| tree | b961581aa2973465a1fd8e0aa4b1d607ca42d963 /devel/cmake/files/patch-Modules_FindOpenMP.cmake | |
| parent | Update to 8.34.0 (diff) | |
Update CMake to 3.11.0. Thanks to antoine@ for the exp-run.
In the run-up to this commit, many other ports were pre-emptively fixed.
The only issue still known is math/kig, which had a build failure in
the exp-run, but which isn't reproducible across multiple 11.1 {i386,amd64}
machines and poudriere builds. We've decided to forge ahead.
The new CMake version:
- drops FreeBSD patches that have been incorporated upstream,
- re-shuffles patches to FindQt4, since upstream has made some changes
which break FindQt4 in new ways on FreeBSD (while fixing the old ones),
- has new patches to make OpenMP and BLAS findable on FreeBSD,
- drops ports libarchive in favor of the version in base, to avoid
overlinking for the pkg(8) support in CPack (this makes portlint
complain, and we have decided to ignore it).
PR: 227372 226959 223678
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D14506
Notes
Notes:
svn path=/head/; revision=467437
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindOpenMP.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindOpenMP.cmake | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/devel/cmake/files/patch-Modules_FindOpenMP.cmake b/devel/cmake/files/patch-Modules_FindOpenMP.cmake new file mode 100644 index 000000000000..68726ea95fe3 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindOpenMP.cmake @@ -0,0 +1,16 @@ +Avoid looking for pthread by simply asserting that it is there. +Otherwise openmp can't be found because the pthread library +lives in /usr/lib and CMake 3.11 doesn't look there anymore +while looking for openmp. PR 223678. + +--- Modules/FindOpenMP.cmake 2018-04-07 20:56:40.059488000 +0000 ++++ Modules/FindOpenMP.cmake 2018-04-07 21:48:55.681077000 +0000 +@@ -79,6 +79,8 @@ + cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced + cmake_policy(SET CMP0057 NEW) # if IN_LIST + ++set(OpenMP_pthread_LIBRARY -lpthread) ++ + function(_OPENMP_FLAG_CANDIDATES LANG) + message(STATUS "FindOpenMP: flag-candidates ${LANG}") + if(NOT OpenMP_${LANG}_FLAG) |