diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-04 14:34:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 14:34:48 -0700 |
| commit | 9b52245a0d079c06204ba3e54461717a4ee8d9f7 (patch) | |
| tree | 93b78fe59e163922aa73b3d3ee39ba1f13c4ecec | |
| parent | d358c7f194f2cbaa0233a6783dc8dddb01e48959 (diff) | |
| parent | ec3858c6b1679cc5bf360d69a97774498205da84 (diff) | |
| download | vcpkg-9b52245a0d079c06204ba3e54461717a4ee8d9f7.tar.gz vcpkg-9b52245a0d079c06204ba3e54461717a4ee8d9f7.zip | |
Merge pull request #1567 from ousttrue/alembic-cmake3.9-hdf5-issue
[alembic] fix FindHDF5.cmake issue for cmake-3.9.0
| -rw-r--r-- | ports/alembic/CONTROL | 2 | ||||
| -rw-r--r-- | ports/alembic/bypass-findhdf5.patch | 30 | ||||
| -rw-r--r-- | ports/alembic/portfile.cmake | 8 |
3 files changed, 37 insertions, 3 deletions
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 274328735..c12a59217 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,4 +1,4 @@ Source: alembic -Version: 1.7.1-2 +Version: 1.7.1-3 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/ diff --git a/ports/alembic/bypass-findhdf5.patch b/ports/alembic/bypass-findhdf5.patch new file mode 100644 index 000000000..91cb37fab --- /dev/null +++ b/ports/alembic/bypass-findhdf5.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ce0a8e0..229fc77 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,7 +226,24 @@ INCLUDE_DIRECTORIES(${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}) + IF (USE_HDF5) + FIND_PACKAGE(ZLIB REQUIRED) + SET(ALEMBIC_WITH_HDF5 "1") +- INCLUDE("./cmake/AlembicHDF5.cmake") ++ #INCLUDE("./cmake/AlembicHDF5.cmake") ++ FIND_LIBRARY(HDF5_LIBRARIES_RELEASE ++ NAMES hdf5 ++ PATHS ${HDF5_ROOT}/lib ++ ) ++ MESSAGE(STATUS ${HDF5_LIBRARIES_RELEASE}) ++ FIND_LIBRARY(HDF5_LIBRARIES_DEBUG ++ NAMES hdf5_D ++ PATHS ${HDF5_ROOT}/debug/lib ++ ) ++ MESSAGE(STATUS ${HDF5_LIBRARIES_DEBUG}) ++ SET(HDF5_LIBRARIES ++ optimized ${HDF5_LIBRARIES_RELEASE} ++ debug ${HDF5_LIBRARIES_DEBUG} ++ ) ++ SET(HDF5_INCLUDE_DIRS ++ ${HDF5_ROOT}/include ++ ) + INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API") + ENDIF() diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 56c3a4d30..0d7b67dda 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -15,12 +15,16 @@ vcpkg_from_github( vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch + ${CMAKE_CURRENT_LIST_DIR}/bypass-findhdf5.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DUSE_HDF5=ON + OPTIONS + -DUSE_HDF5=ON + -DHDF5_ROOT=${CURRENT_INSTALLED_DIR} ) vcpkg_install_cmake() |