diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2013-01-03 20:32:50 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-01-03 20:32:50 +0000 |
| commit | 8440063c231e2152200b3a670715dd7329dec2e8 (patch) | |
| tree | e2c4baea26463a5efc18caeda7fa473ce31713a1 /dev-lang/gdl/files | |
| parent | fixed mistake for emake:-all emake:-install between old and new plugin makefi... (diff) | |
| download | historical-8440063c231e2152200b3a670715dd7329dec2e8.tar.gz historical-8440063c231e2152200b3a670715dd7329dec2e8.tar.bz2 historical-8440063c231e2152200b3a670715dd7329dec2e8.zip | |
Added a patch for netcdf-4 support, bug #449984
Package-Manager: portage-2.2.01.21476-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'dev-lang/gdl/files')
| -rw-r--r-- | dev-lang/gdl/files/0.9.3-netcdf-cxx.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch b/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch new file mode 100644 index 000000000000..2239d46c74c0 --- /dev/null +++ b/dev-lang/gdl/files/0.9.3-netcdf-cxx.patch @@ -0,0 +1,36 @@ +--- 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) |