diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-07-16 10:52:14 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-07-16 10:52:14 +0000 |
| commit | e4a20681de084d962b9003216c1e8bc9f1e04e6c (patch) | |
| tree | feb8b701f72c97bef40c751c91f99c4c8fe3bacf /math/plplot | |
| parent | Update to 0.9.15 (diff) | |
Add a patch (sent upstream) to make configuration work with CMake 3.6.0.
PR: 210988
Notes
Notes:
svn path=/head/; revision=418628
Diffstat (limited to 'math/plplot')
| -rw-r--r-- | math/plplot/files/patch-cmake_modules_pkg-config.cmake | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake new file mode 100644 index 000000000000..0eab651034f2 --- /dev/null +++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake @@ -0,0 +1,18 @@ +Adjust parameters passed to _pkg_check_modules_internal(). +Required for building with CMake 3.6.0. + +Submitted upstream: https://sourceforge.net/p/plplot/patches/33/ +--- cmake/modules/pkg-config.cmake.orig 2016-07-16 10:36:31 UTC ++++ cmake/modules/pkg-config.cmake +@@ -120,8 +120,10 @@ macro(pkg_check_pkgconfig _package _incl + + if(CMAKE_VERSION VERSION_LESS "3.1") + _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") +- else(CMAKE_VERSION VERSION_LESS "3.1") ++ elseif(CMAKE_VERSION VERSION_LESS "3.6") + _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") ++ else(CMAKE_VERSION VERSION_LESS "3.1") ++ _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") + endif(CMAKE_VERSION VERSION_LESS "3.1") + + if(${_prefix}_FOUND) |