Changeset 147988 for trunk


Ignore:
Timestamp:
Apr 23, 2016, 5:31:16 AM (3 years ago)
Author:
takeshi@…
Message:

netcdf: corrected the specification of the header path to hdf5-18. See #51089

Location:
trunk/dports/science/netcdf
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/netcdf/Portfile

    r147800 r147988  
    1010
    1111github.setup                Unidata netcdf-c 4.4.0 v
    12 revision                    2
     12revision                    3
    1313epoch                       3
    1414name                        netcdf
     
    4646if {[variant_isset netcdf4]} {
    4747    mpi.enforce_variant         hdf5-18
    48     configure.cflags-append     -I${prefix}/include/hdf5-18
    4948    configure.ldflags-append    -L${prefix}/lib/hdf5-18
    5049    configure.args-append       -DHDF5_INCLUDE_DIR=${prefix}/include/hdf5-18 \
  • trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff

    r147087 r147988  
    11--- CMakeLists.txt.orig 2016-01-14 06:40:17.000000000 +0900
    2 +++ CMakeLists.txt      2016-03-26 17:00:08.000000000 +0900
     2+++ CMakeLists.txt      2016-04-23 14:22:34.000000000 +0900
    33@@ -82,8 +82,7 @@
    44 ENDIF()
     
    1111 # auto-configure style checks, other CMake modules.
    1212 INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
     13@@ -493,6 +492,7 @@
     14   ##
     15   IF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
     16     SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
     17+    INCLUDE_DIRECTORIES(BEFORE ${HDF5_INCLUDE_DIR})
     18     MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
     19     MESSAGE(STATUS "Using HDF5 HL LIbrary: ${HDF5_HL_LIBRARY}")
     20   ELSE(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) # We are seeking out HDF5 with Find Package.
Note: See TracChangeset for help on using the changeset viewer.