diff options
| author | Toby Chen <chenyanjun912@hotmail.com> | 2019-03-14 22:45:46 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-14 22:45:46 -0700 |
| commit | 7d701a92a36fa665b860643b7837d5f18d9fd9cd (patch) | |
| tree | eeddbb32e32c340875dca4603de68754929f524c | |
| parent | b2ad98002979ea247cd6e64de43763bbf28eded3 (diff) | |
| download | vcpkg-7d701a92a36fa665b860643b7837d5f18d9fd9cd.tar.gz vcpkg-7d701a92a36fa665b860643b7837d5f18d9fd9cd.zip | |
[openexr] Fix IlmImf.dll installed to the wrong location (#5677)
| -rw-r--r-- | ports/openexr/fix_install_ilmimf.patch | 19 | ||||
| -rw-r--r-- | ports/openexr/portfile.cmake | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ports/openexr/fix_install_ilmimf.patch b/ports/openexr/fix_install_ilmimf.patch new file mode 100644 index 000000000..db65be736 --- /dev/null +++ b/ports/openexr/fix_install_ilmimf.patch @@ -0,0 +1,19 @@ +diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt +index e1a8740..d31cf68 100644 +--- a/OpenEXR/IlmImf/CMakeLists.txt ++++ b/OpenEXR/IlmImf/CMakeLists.txt +@@ -2,14 +2,6 @@ + + SET(CMAKE_INCLUDE_CURRENT_DIR 1) + +-IF (WIN32) +- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/bin) +- SET(WORKING_DIR ${RUNTIME_DIR}) +-ELSE () +- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/lib) +- SET(WORKING_DIR .) +-ENDIF () +- + SET(BUILD_B44EXPLOGTABLE OFF) + IF (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h") + SET(BUILD_B44EXPLOGTABLE ON) diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index c32d07123..f06ee4841 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( REF v${OPENEXR_VERSION} SHA512 ${OPENEXR_HASH} HEAD_REF master + PATCHES "fix_install_ilmimf.patch" ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} |