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

4 files changed, 29 insertions, 42 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()
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index ae2758c1f..555be3a5d 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,4 +1,4 @@
 Source: poco
-Version: 1.7.6-3
+Version: 1.7.6-4
 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.
\ No newline at end of file
+Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index e774c3c17..f61ce16d9 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -11,24 +11,26 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-		${CMAKE_CURRENT_LIST_DIR}/config_h.patch
-		${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
-		${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch
+        ${CMAKE_CURRENT_LIST_DIR}/config_h.patch
+        ${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
+        ${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	set(POCO_STATIC ON)
+    set(POCO_STATIC ON)
 else()
-	set(POCO_STATIC OFF)
+    set(POCO_STATIC OFF)
 endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-	OPTIONS
-		-DPOCO_STATIC=${POCO_STATIC}
-		-DENABLE_SEVENZIP=ON
-		-DENABLE_TESTS=OFF
-		-DPOCO_UNBUNDLED=ON # OFF means: using internal copy of sqlite, libz, pcre, expat, ...
+    PREFER_NINJA
+    OPTIONS
+        -DPOCO_STATIC=${POCO_STATIC}
+        -DENABLE_SEVENZIP=ON
+        -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()
@@ -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)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	file(REMOVE_RECURSE 
-		${CURRENT_PACKAGES_DIR}/bin
-		${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE 
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
-	file(REMOVE 
-		${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb
-		${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb
-		${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe
-		${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb
-		${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe
-		${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)
+    file(REMOVE 
+        ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb
+        ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb
+        ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe
+        ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb
+        ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe
+        ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -63,4 +59,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
 
 # copy license
 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)
\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/poco/LICENSE ${CURRENT_PACKAGES_DIR}/share/poco/copyright)