From: "Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.3-netcdf-cxx.patch
Date: Thu, 3 Jan 2013 20:32:41 +0000 (UTC) [thread overview]
Message-ID: <20130103203241.2A37B2171E@flycatcher.gentoo.org> (raw)
bicatali 13/01/03 20:32:41
Added: 0.9.3-netcdf-cxx.patch
Log:
Added a patch for netcdf-4 support, bug #449984
(Portage version: 2.2.01.21476-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.1 dev-lang/gdl/files/0.9.3-netcdf-cxx.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch?rev=1.1&content-type=text/plain
Index: 0.9.3-netcdf-cxx.patch
===================================================================
--- CMakeModules/FindNetCDF.cmake.orig 2013-01-03 11:27:52.373435387 -0800
+++ CMakeModules/FindNetCDF.cmake 2013-01-03 12:23:04.710333638 -0800
@@ -9,16 +9,29 @@
#
-find_path(NETCDFPKG netcdf.pc PATH_SUFFIXES lib lib/pkgconfig)
+find_path(NETCDFPKG netcdf-cxx4.pc PATH_SUFFIXES lib lib/pkgconfig)
+if(NETCDFPKG)
+ set(netcdfpc netcdf-cxx4)
+else(NETCDFPKG)
+ find_path(NETCDFPKG netcdf.pc PATH_SUFFIXES lib lib/pkgconfig)
+ set(netcdfpc netcdf)
+endif(NETCDFPKG)
+
include(FindPackageHandleStandardArgs)
if(NETCDFPKG)
set(ENV{PKG_CONFIG_PATH} ${NETCDFPKG}) # pkg search path
include(FindPkgConfig)
- pkg_check_modules(NETCDF netcdf)
+ pkg_check_modules(NETCDF ${netcdfpc})
if(NETCDF_FOUND)
- find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS)
+ if(NETCDF_INCLUDE_DIRS)
+ find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS)
+ else(NETCDF_INCLUDE_DIRS)
+ find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES)
+ endif(NETCDF_INCLUDE_DIRS)
+ message("-- Found NETCDF_LIBRARIES = ${NETCDF_LIBRARIES}")
+ message("-- Found NETCDF_INCLUDE_DIRS = ${NETCDF_INCLUDE_DIRS}")
endif(NETCDF_FOUND)
-else(NETCDFPKG) # no netcdf.pc file
+else(NETCDFPKG) # no pc file
find_library(NETCDF_LIBRARIES NAMES netcdf)
find_path(NETCDF_INCLUDE_DIRS NAMES netcdfcpp.h PATH_SUFFIXES netcdf-3)
find_package_handle_standard_args(NETCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDE_DIRS)
next reply other threads:[~2013-01-03 20:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-03 20:32 Sebastien Fabbro (bicatali) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-10 22:40 [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.3-netcdf-cxx.patch Sebastien Fabbro (bicatali)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130103203241.2A37B2171E@flycatcher.gentoo.org \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox