diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-05-22 21:59:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 21:59:44 -0700 |
| commit | c7a837801684401b837bfd133c76e535e2372589 (patch) | |
| tree | f98bff7940e9dc90beae11cb2b3450f44b070577 | |
| parent | bb497a2acca594dd2d756f20171f68366f545989 (diff) | |
| parent | 93906ae1c4eb9c9d3a5b83f0673cc98ec35c4222 (diff) | |
| download | vcpkg-c7a837801684401b837bfd133c76e535e2372589.tar.gz vcpkg-c7a837801684401b837bfd133c76e535e2372589.zip | |
Merge pull request #6557 from wangli28/dev/Lily/issue6548
[OpenEXR] Fix copyright install path
| -rw-r--r-- | ports/openexr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openexr/portfile.cmake | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index ea85a082f..5fd21f6da 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,4 +1,4 @@ Source: openexr -Version: 2.3.0-2 +Version: 2.3.0-3 Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Build-Depends: zlib diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index f06ee4841..256a133b4 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -60,11 +60,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(OPENEXR_PORT_DIR "openexr") -else() - set(OPENEXR_PORT_DIR "OpenEXR") -endif() +set(OPENEXR_PORT_DIR "openexr") file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}) file(RENAME ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/copyright) |