aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio <silvio.traversaro@iit.it>2016-10-24 23:04:00 +0200
committerSilvio <silvio.traversaro@iit.it>2016-10-24 23:05:05 +0200
commit3e4ccad0f982aff729987e77514f6cbade9ebb1a (patch)
tree8fe7ca5b2dc03894b3fd30ec66fce8b17c55a7d8
parentf6b7c7da82586ec59afda8201f301af9780f8a9e (diff)
downloadvcpkg-3e4ccad0f982aff729987e77514f6cbade9ebb1a.tar.gz
vcpkg-3e4ccad0f982aff729987e77514f6cbade9ebb1a.zip
[openjpeg] Fix location of cmake config files
-rw-r--r--ports/openjpeg/portfile.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake
index f03e4ce13..496a22542 100644
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DBUILD_CODEC:BOOL=OFF
+ -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg
)
vcpkg_install_cmake()
@@ -18,9 +19,11 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle debug cmake config files (see https://github.com/Microsoft/vcpkg/issues/77)
-file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake OPENJPEG_DEBUG_MODULE)
+file(READ ${CURRENT_PACKAGES_DIR}/debug/share/openjpeg/OpenJPEGTargets-debug.cmake OPENJPEG_DEBUG_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENJPEG_DEBUG_MODULE "${OPENJPEG_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/lib/openjpeg-2.1/OpenJPEGTargets-debug.cmake "${OPENJPEG_DEBUG_MODULE}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/openjpeg/OpenJPEGTargets-debug.cmake "${OPENJPEG_DEBUG_MODULE}")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openjpeg)