diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-10 16:08:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 16:08:37 -0700 |
| commit | 7ad0f085d7496a7cc00b3ee45224dc05ee70845e (patch) | |
| tree | 7db5ce0dedd42865fe50b9079a2b44f169cb3c55 /ports/netcdf-c | |
| parent | fa1823dcad96448230d30f01f35628b2e1feab08 (diff) | |
| download | vcpkg-7ad0f085d7496a7cc00b3ee45224dc05ee70845e.tar.gz vcpkg-7ad0f085d7496a7cc00b3ee45224dc05ee70845e.zip | |
[netcdf-c] Fix dependency libmath (#12434)
* [netcdf-c] Add dependency embree3
* [netcdf-c] remove dependency embree3, change the search sequence
* [netcdf-cxx4] Re-fix dependency hdf5
* Update ports/netcdf-c/CONTROL
* [netcdf-c] Remove dependency embree
Diffstat (limited to 'ports/netcdf-c')
| -rw-r--r-- | ports/netcdf-c/CONTROL | 4 | ||||
| -rw-r--r-- | ports/netcdf-c/fix-dependency-libmath.patch | 13 | ||||
| -rw-r--r-- | ports/netcdf-c/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/netcdf-c/usage | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index 18010cb52..92d0439d9 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,6 +1,6 @@ Source: netcdf-c Version: 4.7.3 -Port-Version: 3 -Build-Depends: hdf5, curl, embree3(linux|osx) +Port-Version: 4 +Build-Depends: hdf5, curl Homepage: https://github.com/Unidata/netcdf-c Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/fix-dependency-libmath.patch b/ports/netcdf-c/fix-dependency-libmath.patch new file mode 100644 index 000000000..0db00ccaf --- /dev/null +++ b/ports/netcdf-c/fix-dependency-libmath.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35c694f..e2c03e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -839,7 +839,7 @@ ENDIF() + + # Check for the math library so it can be explicitly linked. + IF(NOT WIN32) +- FIND_LIBRARY(HAVE_LIBM NAMES math m libm) ++ FIND_LIBRARY(HAVE_LIBM NAMES m libm math) + MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}") + IF(NOT HAVE_LIBM) + MESSAGE(FATAL_ERROR "Unable to find the math library.") diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index d1af9d9f1..4813aa5b8 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( config-pkg-location.patch use_targets.patch mpi.patch + fix-dependency-libmath.patch ) #Remove outdated find modules diff --git a/ports/netcdf-c/usage b/ports/netcdf-c/usage index 98824b337..681a20f8c 100644 --- a/ports/netcdf-c/usage +++ b/ports/netcdf-c/usage @@ -1,4 +1,4 @@ The package netcdf-c provides CMake targets:
find_package(netCDF CONFIG REQUIRED)
- target_link_libraries(main PRIVATE netcdf)
\ No newline at end of file + target_link_libraries(main PRIVATE netcdf)
|