Date: Sat, 16 Jul 2016 10:52:14 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418628 - head/math/plplot/files Message-ID: <201607161052.u6GAqECU033744@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Jul 16 10:52:14 2016 New Revision: 418628 URL: https://svnweb.freebsd.org/changeset/ports/418628 Log: Add a patch (sent upstream) to make configuration work with CMake 3.6.0. PR: 210988 Added: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake (contents, props changed) Added: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Sat Jul 16 10:52:14 2016 (r418628) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607161052.u6GAqECU033744>