| 1 |
jlec 15/02/02 10:13:30 |
| 2 |
|
| 3 |
Added: plplot-5.10.0-cmake.patch |
| 4 |
Log: |
| 5 |
sci-libs/plplot: Backport fix for cmake-3.10, #537670 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/plplot/files/plplot-5.10.0-cmake.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.10.0-cmake.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.10.0-cmake.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: plplot-5.10.0-cmake.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake |
| 18 |
index 3f842aa..4d269bd 100644 |
| 19 |
--- a/cmake/modules/pkg-config.cmake |
| 20 |
+++ b/cmake/modules/pkg-config.cmake |
| 21 |
@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v |
| 22 |
set(_xprefix ${_prefix}) |
| 23 |
endif(FORCE_EXTERNAL_STATIC) |
| 24 |
|
| 25 |
- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") |
| 26 |
+ if(CMAKE_VERSION VERSION_LESS "3.1") |
| 27 |
+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") |
| 28 |
+ else(CMAKE_VERSION VERSION_LESS "3.1") |
| 29 |
+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") |
| 30 |
+ endif(CMAKE_VERSION VERSION_LESS "3.1") |
| 31 |
+ |
| 32 |
if(${_prefix}_FOUND) |
| 33 |
cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}") |
| 34 |
# If libraries cannot be not found, then that is equivalent to whole |
Archives