[147988] trunk/dports/science/netcdf

[takeshi at macports.org]

Revision: 147988
          https://trac.macports.org/changeset/147988
Author:   takeshi at macports.org
Date:     2016-04-22 22:31:16 -0700 (Fri, 22 Apr 2016)
Log Message:
-----------
netcdf: corrected the specification of the header path to hdf5-18. See #51089

Modified Paths:
--------------
    trunk/dports/science/netcdf/Portfile
    trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile	2016-04-23 02:30:30 UTC (rev 147987)
+++ trunk/dports/science/netcdf/Portfile	2016-04-23 05:31:16 UTC (rev 147988)
@@ -9,7 +9,7 @@
 
 
 github.setup                Unidata netcdf-c 4.4.0 v
-revision                    2
+revision                    3
 epoch                       3
 name                        netcdf
 maintainers                 takeshi openmaintainer
@@ -45,7 +45,6 @@
 
 if {[variant_isset netcdf4]} {
     mpi.enforce_variant         hdf5-18
-    configure.cflags-append     -I${prefix}/include/hdf5-18
     configure.ldflags-append    -L${prefix}/lib/hdf5-18
     configure.args-append       -DHDF5_INCLUDE_DIR=${prefix}/include/hdf5-18 \
                                 -DHDF5_C_LIBRARY=${prefix}/lib/hdf5-18/libhdf5.dylib \

Modified: trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff	2016-04-23 02:30:30 UTC (rev 147987)
+++ trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff	2016-04-23 05:31:16 UTC (rev 147988)
@@ -1,5 +1,5 @@
 --- CMakeLists.txt.orig	2016-01-14 06:40:17.000000000 +0900
-+++ CMakeLists.txt	2016-03-26 17:00:08.000000000 +0900
++++ CMakeLists.txt	2016-04-23 14:22:34.000000000 +0900
 @@ -82,8 +82,7 @@
  ENDIF()
  
@@ -10,3 +10,11 @@
  
  # auto-configure style checks, other CMake modules.
  INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+@@ -493,6 +492,7 @@
+   ##
+   IF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
+     SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
++    INCLUDE_DIRECTORIES(BEFORE ${HDF5_INCLUDE_DIR})
+     MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
+     MESSAGE(STATUS "Using HDF5 HL LIbrary: ${HDF5_HL_LIBRARY}")
+   ELSE(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) # We are seeking out HDF5 with Find Package.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160422/124c409b/attachment.html>