diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-06 10:44:46 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-06 10:44:46 -0800 |
| commit | 1b9b19e66c7a9933fb0b205db864c5060a7be865 (patch) | |
| tree | ddf6da3097564fc55cffc43096c1be04f9b0f582 /ports/openjpeg | |
| parent | 883b865f8e8e15877b83f22797ed347ad36beeb1 (diff) | |
| parent | 2825c305e3e8c0b80b40a259d28ac318b819e7c3 (diff) | |
| download | vcpkg-1b9b19e66c7a9933fb0b205db864c5060a7be865.tar.gz vcpkg-1b9b19e66c7a9933fb0b205db864c5060a7be865.zip | |
Merge branch 'say-no-to-crt-dlls' of https://github.com/codicodi/vcpkg into codicodi-say-no-to-crt-dlls
Diffstat (limited to 'ports/openjpeg')
| -rw-r--r-- | ports/openjpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openjpeg/portfile.cmake | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL index f137d0ebc..cd2f0aaa8 100644 --- a/ports/openjpeg/CONTROL +++ b/ports/openjpeg/CONTROL @@ -1,3 +1,3 @@ Source: openjpeg -Version: 2.1.2 +Version: 2.1.2-1 Description: JPEG 2000 image library diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index dfa25881d..efda08313 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -9,8 +9,10 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_CODEC:BOOL=OFF -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON ) vcpkg_install_cmake() @@ -23,19 +25,8 @@ string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENJPEG_DEBUG_MO file(WRITE ${CURRENT_PACKAGES_DIR}/share/openjpeg/OpenJPEGTargets-debug.cmake "${OPENJPEG_DEBUG_MODULE}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# Cleanup bin directories in static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -# Cleanup Visual C++ Redistributable runtime -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/msvcp140.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/vcruntime140.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140.dll) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140.dll) - # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openjpeg) file(RENAME ${CURRENT_PACKAGES_DIR}/share/openjpeg/LICENSE ${CURRENT_PACKAGES_DIR}/share/openjpeg/copyright) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() |