* [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.3-netcdf-cxx.patch
@ 2013-01-03 20:32 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2013-01-03 20:32 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.3-netcdf-cxx.patch
@ 2013-01-10 22:40 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2013-01-10 22:40 UTC (permalink / raw
To: gentoo-commits
bicatali 13/01/10 22:40:35
Modified: 0.9.3-netcdf-cxx.patch
Log:
Make sure we build an exec when python is not selected (bug #451070). Trim the netcdf patch, depend on netcdf-cxx-4.2-r1 to avoid underlinking
(Portage version: 2.2.01.21476-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch?r1=1.1&r2=1.2
Index: 0.9.3-netcdf-cxx.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.9.3-netcdf-cxx.patch 3 Jan 2013 20:32:41 -0000 1.1
+++ 0.9.3-netcdf-cxx.patch 10 Jan 2013 22:40:35 -0000 1.2
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -9,16 +9,27 @@
#
@@ -26,11 +26,9 @@
+ 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
++else(NETCDFPKG) # no pc file. assume netcdf-3
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-10 22:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-10 22:40 [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: 0.9.3-netcdf-cxx.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2013-01-03 20:32 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox