Merge branch 'say-no-to-crt-dlls' of https://github.com/codicodi/vcpkg into codicodi-say-no-to-crt-dlls

This commit is contained in:
Robert Schumacher 2017-03-06 10:44:46 -08:00
commit 1b9b19e66c
4 changed files with 29 additions and 42 deletions

View File

@ -1,3 +1,3 @@
Source: openjpeg Source: openjpeg
Version: 2.1.2 Version: 2.1.2-1
Description: JPEG 2000 image library Description: JPEG 2000 image library

View File

@ -9,8 +9,10 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DBUILD_CODEC:BOOL=OFF OPTIONS -DBUILD_CODEC:BOOL=OFF
-DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
) )
vcpkg_install_cmake() 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(WRITE ${CURRENT_PACKAGES_DIR}/share/openjpeg/OpenJPEGTargets-debug.cmake "${OPENJPEG_DEBUG_MODULE}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) 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 # Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openjpeg) 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) file(RENAME ${CURRENT_PACKAGES_DIR}/share/openjpeg/LICENSE ${CURRENT_PACKAGES_DIR}/share/openjpeg/copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,4 +1,4 @@
Source: poco Source: poco
Version: 1.7.6-3 Version: 1.7.6-4
Build-Depends: zlib, pcre, sqlite3, expat Build-Depends: zlib, pcre, sqlite3, expat
Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.

View File

@ -11,24 +11,26 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES PATCHES
${CMAKE_CURRENT_LIST_DIR}/config_h.patch ${CMAKE_CURRENT_LIST_DIR}/config_h.patch
${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch ${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch ${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(POCO_STATIC ON) set(POCO_STATIC ON)
else() else()
set(POCO_STATIC OFF) set(POCO_STATIC OFF)
endif() endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS PREFER_NINJA
-DPOCO_STATIC=${POCO_STATIC} OPTIONS
-DENABLE_SEVENZIP=ON -DPOCO_STATIC=${POCO_STATIC}
-DENABLE_TESTS=OFF -DENABLE_SEVENZIP=ON
-DPOCO_UNBUNDLED=ON # OFF means: using internal copy of sqlite, libz, pcre, expat, ... -DENABLE_TESTS=OFF
-DPOCO_UNBUNDLED=ON # OFF means: using internal copy of sqlite, libz, pcre, expat, ...
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
) )
vcpkg_install_cmake() vcpkg_install_cmake()
@ -38,23 +40,17 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/bin/cpspc.exe ${CURRENT_PACKAGES_DIR}/tools/
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/tools/f2cpsp.exe) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/tools/f2cpsp.exe)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin) ${CURRENT_PACKAGES_DIR}/debug/bin)
else() else()
file(REMOVE file(REMOVE
${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb
${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb
${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe
${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb
${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe
${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb) ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb)
file(REMOVE
${CURRENT_PACKAGES_DIR}/bin/vcruntime140.dll
${CURRENT_PACKAGES_DIR}/bin/msvcp140.dll
${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140.dll
${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140.dll)
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@ -63,4 +59,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
# copy license # copy license
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/poco) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/poco)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/poco/LICENSE ${CURRENT_PACKAGES_DIR}/share/poco/copyright) file(RENAME ${CURRENT_PACKAGES_DIR}/share/poco/LICENSE ${CURRENT_PACKAGES_DIR}/share/poco/copyright)