jlec        15/02/02 10:13:30

  Added:                plplot-5.10.0-cmake.patch
  Log:
  sci-libs/plplot: Backport fix for cmake-3.10, #537670
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  sci-libs/plplot/files/plplot-5.10.0-cmake.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.10.0-cmake.patch?rev=1.1&view=markup
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

Index: plplot-5.10.0-cmake.patch
===================================================================
diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
index 3f842aa..4d269bd 100644
--- a/cmake/modules/pkg-config.cmake
+++ b/cmake/modules/pkg-config.cmake
@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR 
_link_FLAGS _cflags _v
     set(_xprefix ${_prefix})
   endif(FORCE_EXTERNAL_STATIC)
   
-  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
+  if(CMAKE_VERSION VERSION_LESS "3.1")
+    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
+  else(CMAKE_VERSION VERSION_LESS "3.1")
+    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
+  endif(CMAKE_VERSION VERSION_LESS "3.1")
+    
   if(${_prefix}_FOUND)
     cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
     # If libraries cannot be not found, then that is equivalent to whole




Reply via email to