diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-10-28 14:18:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 14:18:07 -0700 |
| commit | 09a647a5261e981cbbc8219292c838490ed0b06f (patch) | |
| tree | 9d18df2f364a3d2bbaa156d76f5d265fc442c2f3 | |
| parent | ead8d6bad477f0b075f31097673c3e440356cd3b (diff) | |
| download | vcpkg-09a647a5261e981cbbc8219292c838490ed0b06f.tar.gz vcpkg-09a647a5261e981cbbc8219292c838490ed0b06f.zip | |
Delete use of vcpkg_test_cmake and vcpkg_common_functions. (#13065)
503 files changed, 167 insertions, 1207 deletions
diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index aec901dc4..887311127 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -1,5 +1,5 @@ -<!-- Run regenerate.ps1 to extract documentation from scripts\cmake\*.cmake --> - +<!-- Run regenerate.ps1 to extract documentation from scripts\cmake\*.cmake -->
+
# Portfile helper functions
- [execute\_process](execute_process.md)
- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
@@ -45,4 +45,3 @@ - [vcpkg\_install\_nmake](vcpkg_install_nmake.md)
- [vcpkg\_install\_qmake](vcpkg_install_qmake.md)
- [vcpkg\_prettify\_command](vcpkg_prettify_command.md)
-- [vcpkg\_test\_cmake](vcpkg_test_cmake.md)
diff --git a/docs/maintainers/vcpkg_test_cmake.md b/docs/maintainers/vcpkg_test_cmake.md deleted file mode 100644 index 15b3ad797..000000000 --- a/docs/maintainers/vcpkg_test_cmake.md +++ /dev/null @@ -1,20 +0,0 @@ -# vcpkg_test_cmake - -Tests a built package for CMake `find_package()` integration. - -## Usage: -```cmake -vcpkg_test_cmake(PACKAGE_NAME <name> [MODULE]) -``` - -## Parameters: - -### PACKAGE_NAME -The expected name to find with `find_package()`. - -### MODULE -Indicates that the library expects to be found via built-in CMake targets. - - -## Source -[scripts/cmake/vcpkg_test_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_test_cmake.cmake)
diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index 40c902137..67d749b00 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - # Check architecture: if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(BUILD_ARCH "Win32") diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index 83d8503b8..c5becf7eb 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/ade
diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake index f76b1d987..c1e278947 100644 --- a/ports/aixlog/portfile.cmake +++ b/ports/aixlog/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO badaix/aixlog
- REF c268f271ef7e7181389205e985740f29e6744a8c # v1.4.0 + REF c268f271ef7e7181389205e985740f29e6744a8c # v1.4.0
SHA512 7014d22a0bdbaf85191d18652531af6e0c8ff6d8041bf92a80d51994cfbdf0d9d63c4f8836b9bba16d1895ffa03ad0749a42bd11706eb5f3cde1dcbe76746c24
)
@@ -11,6 +9,3 @@ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME aixlog)
diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake index 058179b86..15c8152b3 100644 --- a/ports/alac-decoder/portfile.cmake +++ b/ports/alac-decoder/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/alac/portfile.cmake b/ports/alac/portfile.cmake index ce5c6bad1..d9dd83141 100644 --- a/ports/alac/portfile.cmake +++ b/ports/alac/portfile.cmake @@ -2,8 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/aliyun-oss-c-sdk/portfile.cmake b/ports/aliyun-oss-c-sdk/portfile.cmake index 2bc845201..6b3af2ab1 100644 --- a/ports/aliyun-oss-c-sdk/portfile.cmake +++ b/ports/aliyun-oss-c-sdk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index 2ae7b487b..868bcb1fc 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO liballeg/allegro5 diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake index 00d577e56..71de6915e 100644 --- a/ports/ampl-mp/portfile.cmake +++ b/ports/ampl-mp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -44,4 +42,3 @@ configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() -vcpkg_test_cmake(PACKAGE_NAME unofficial-mp) diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake index bdecbf39e..411e04830 100644 --- a/ports/anax/portfile.cmake +++ b/ports/anax/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index c0d41d948..a90f361bb 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip" FILENAME "angelscript_2.34.0.zip" diff --git a/ports/any-lite/portfile.cmake b/ports/any-lite/portfile.cmake index aba905134..22809839c 100644 --- a/ports/any-lite/portfile.cmake +++ b/ports/any-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/any-lite
diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake index f32855eae..54d32171a 100644 --- a/ports/argagg/portfile.cmake +++ b/ports/argagg/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vietjtnguyen/argagg
diff --git a/ports/argh/portfile.cmake b/ports/argh/portfile.cmake index eb6411772..ccaec1449 100644 --- a/ports/argh/portfile.cmake +++ b/ports/argh/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO adishavit/argh
@@ -34,6 +32,3 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/argparse/portfile.cmake b/ports/argparse/portfile.cmake index 82216fdb2..70baaf628 100644 --- a/ports/argparse/portfile.cmake +++ b/ports/argparse/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO p-ranav/argparse
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index b1c3152b5..fa006e51b 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 6c6d438a1..685aa5be6 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio diff --git a/ports/asynch/portfile.cmake b/ports/asynch/portfile.cmake index 7625b9528..8f538a222 100644 --- a/ports/asynch/portfile.cmake +++ b/ports/asynch/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO naasking/async.h
diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake index f32ece6c1..d412f1148 100644 --- a/ports/asyncplusplus/portfile.cmake +++ b/ports/asyncplusplus/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -30,5 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus) file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright) - -vcpkg_test_cmake(PACKAGE_NAME Async++) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 34f639141..a0d012859 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(ATK_VERSION 2.24.0) diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 11840cc56..9614c1735 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/aurora/portfile.cmake b/ports/aurora/portfile.cmake index 32e3d804f..bce54c2bc 100644 --- a/ports/aurora/portfile.cmake +++ b/ports/aurora/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Bromeon/Aurora diff --git a/ports/autobahn/portfile.cmake b/ports/autobahn/portfile.cmake index 0b0f92609..511ffb564 100644 --- a/ports/autobahn/portfile.cmake +++ b/ports/autobahn/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - set(USE_UPSTREAM OFF) if("upstream" IN_LIST FEATURES) set(USE_UPSTREAM ON) diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake index 2f9e5829c..a5e8fcf3e 100644 --- a/ports/azure-macro-utils-c/portfile.cmake +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if("public-preview" IN_LIST FEATURES) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 8fdbbf72a..656de1d33 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index f67153766..afd6e3ab9 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -38,5 +38,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"
"${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"
)
-
-vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3)
diff --git a/ports/bento4/portfile.cmake b/ports/bento4/portfile.cmake index b485fbb19..0e5cb143b 100644 --- a/ports/bento4/portfile.cmake +++ b/ports/bento4/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/binn/portfile.cmake b/ports/binn/portfile.cmake index 278417e3c..1ce3a8cd5 100644 --- a/ports/binn/portfile.cmake +++ b/ports/binn/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/boolinq/portfile.cmake b/ports/boolinq/portfile.cmake index 35ad4994f..8ff8f63be 100644 --- a/ports/boolinq/portfile.cmake +++ b/ports/boolinq/portfile.cmake @@ -1,7 +1,5 @@ # Single-file header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO k06a/boolinq diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index bad139ac2..9188745f5 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
diff --git a/ports/boost-di/portfile.cmake b/ports/boost-di/portfile.cmake index 2027ba0d4..f6d899a60 100644 --- a/ports/boost-di/portfile.cmake +++ b/ports/boost-di/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-experimental/di diff --git a/ports/brigand/portfile.cmake b/ports/brigand/portfile.cmake index c7c17907f..22b7dc08f 100644 --- a/ports/brigand/portfile.cmake +++ b/ports/brigand/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/brunocodutra-metal/portfile.cmake b/ports/brunocodutra-metal/portfile.cmake index 381fa1049..92aa6d204 100644 --- a/ports/brunocodutra-metal/portfile.cmake +++ b/ports/brunocodutra-metal/portfile.cmake @@ -1,11 +1,9 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO brunocodutra/metal
- REF 43256d2c7f5715d9dc029037bcd8512624ec7865 # v2.1.1 + REF 43256d2c7f5715d9dc029037bcd8512624ec7865 # v2.1.1
SHA512 fc69e60b9c21d0215ca2c9ec27ab65d59115397e1d27c90fcdc35ccf8675546b1fbc3be0e6b8f69cd8eb848bac348ca0fe116f50a36ce8d1cbff0d646c4f05cb
HEAD_REF master
)
@@ -26,6 +24,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake index 6d3024f6b..26ff21e42 100644 --- a/ports/butteraugli/portfile.cmake +++ b/ports/butteraugli/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/byte-lite/portfile.cmake b/ports/byte-lite/portfile.cmake index 7fd9f5620..d95c0cf45 100644 --- a/ports/byte-lite/portfile.cmake +++ b/ports/byte-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/byte-lite
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 6d3769b1c..c6835656f 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -2,8 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "c-ares does not currently support UWP.") endif() -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index 930b04dd7..0b19b9eb9 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 2dab7e4c2..414c0df19 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -61,5 +61,3 @@ endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() - -#vcpkg_test_cmake(PACKAGE_NAME unofficial-cairo)
\ No newline at end of file diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index e14f6012e..c1adb249b 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(CAIROMM_VERSION 1.15.3) diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index f352a5f6c..c5cf6efb5 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -28,6 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# Disabled for now, see #5630 and #5635 -# vcpkg_test_cmake(PACKAGE_NAME CapnProto) diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake index b761c39bb..91f6197ec 100644 --- a/ports/cartographer/portfile.cmake +++ b/ports/cartographer/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/casclib/portfile.cmake b/ports/casclib/portfile.cmake index fb2fd77eb..a93b6f857 100644 --- a/ports/casclib/portfile.cmake +++ b/ports/casclib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ladislav-zezula/CascLib
diff --git a/ports/catch-classic/portfile.cmake b/ports/catch-classic/portfile.cmake index 47f8ef16b..097ba07da 100644 --- a/ports/catch-classic/portfile.cmake +++ b/ports/catch-classic/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(CATCH_VERSION v1.12.2) vcpkg_download_distfile(HEADER diff --git a/ports/cccapstone/portfile.cmake b/ports/cccapstone/portfile.cmake index d653783c3..f68609498 100644 --- a/ports/cccapstone/portfile.cmake +++ b/ports/cccapstone/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REF 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index d429e7f52..195af4fe6 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -2,8 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cello/portfile.cmake b/ports/cello/portfile.cmake index e71e53332..279d5c4a8 100644 --- a/ports/cello/portfile.cmake +++ b/ports/cello/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -27,6 +25,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake index d956d86f6..833655e6d 100644 --- a/ports/cereal/portfile.cmake +++ b/ports/cereal/portfile.cmake @@ -1,7 +1,5 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO USCiLab/cereal diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake index 7c5a37f11..74e1cd1c8 100644 --- a/ports/cgltf/portfile.cmake +++ b/ports/cgltf/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/cgltf diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 39b65d55f..895446744 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -83,6 +83,3 @@ endif() # # Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# # Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME cgns)
diff --git a/ports/chaiscript/portfile.cmake b/ports/chaiscript/portfile.cmake index 0c825a7c3..6ee7170e5 100644 --- a/ports/chaiscript/portfile.cmake +++ b/ports/chaiscript/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ChaiScript/ChaiScript diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index 805d7b087..159d38f14 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index 3b57b1934..284af5688 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake index 7ae9dfcd8..5b148640f 100644 --- a/ports/chipmunk/portfile.cmake +++ b/ports/chipmunk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - #architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(CHIPMUNK_ARCH Win32) diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake index 1ecd4751c..32ac77243 100644 --- a/ports/chmlib/portfile.cmake +++ b/ports/chmlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(CHMLIB_VERSION chmlib-0.40) diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 0d168fa11..0550ca028 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" REF v.2.6.2 diff --git a/ports/cityhash/portfile.cmake b/ports/cityhash/portfile.cmake index 7e759e7fb..b5b784723 100644 --- a/ports/cityhash/portfile.cmake +++ b/ports/cityhash/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index 8332562f0..058c9009d 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DaveGamble/cJSON
@@ -58,6 +56,3 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}") # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake index e0f82af5a..7b4799844 100644 --- a/ports/clara/portfile.cmake +++ b/ports/clara/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO philsquared/Clara diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index ba31f7878..6eb78772a 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CNugteren/CLBlast
diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake index c64baf124..592a84b1c 100644 --- a/ports/clfft/portfile.cmake +++ b/ports/clfft/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO clMathLibraries/clFFT diff --git a/ports/clickhouse-cpp/portfile.cmake b/ports/clickhouse-cpp/portfile.cmake index eefea2acf..d6ccf177b 100644 --- a/ports/clickhouse-cpp/portfile.cmake +++ b/ports/clickhouse-cpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/clipp/portfile.cmake b/ports/clipp/portfile.cmake index ff86dbb3f..4793be823 100644 --- a/ports/clipp/portfile.cmake +++ b/ports/clipp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO "muellan/clipp"
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index 7511158de..3c49b79be 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ClockworkOrigins/clockUtils diff --git a/ports/clp/portfile.cmake b/ports/clp/portfile.cmake index df5d8bf05..055ceea18 100644 --- a/ports/clp/portfile.cmake +++ b/ports/clp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/clue/portfile.cmake b/ports/clue/portfile.cmake index 35fd8228b..7fb67edd7 100644 --- a/ports/clue/portfile.cmake +++ b/ports/clue/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/clue diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index da7ac329f..73044e5da 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cmcstl2/portfile.cmake b/ports/cmcstl2/portfile.cmake index e2a0b9a3f..d1e7125a5 100644 --- a/ports/cmcstl2/portfile.cmake +++ b/ports/cmcstl2/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CaseyCarter/cmcstl2
@@ -26,6 +24,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 885cad137..da03f7900 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO johnmcfarlane/cnl
@@ -23,6 +21,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake index 2ca06eb8a..dc479dbd1 100644 --- a/ports/coinutils/portfile.cmake +++ b/ports/coinutils/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index fd295628b..689864cf0 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rdiankov/collada-dom
diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index 9ca4ee28c..d2d104d33 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -1,5 +1,4 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/concurrentqueue diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake index 00dd18718..5ae65507e 100644 --- a/ports/console-bridge/portfile.cmake +++ b/ports/console-bridge/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/console_bridge diff --git a/ports/constexpr/portfile.cmake b/ports/constexpr/portfile.cmake index e56b57e61..65773ccec 100644 --- a/ports/constexpr/portfile.cmake +++ b/ports/constexpr/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO elbeno/constexpr diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 78c7a2a04..8ba526b41 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/corrade diff --git a/ports/cpp-base64/portfile.cmake b/ports/cpp-base64/portfile.cmake index 9016ca2c4..376c1c36a 100644 --- a/ports/cpp-base64/portfile.cmake +++ b/ports/cpp-base64/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ReneNyffenegger/cpp-base64
diff --git a/ports/cpp-peglib/portfile.cmake b/ports/cpp-peglib/portfile.cmake index 25c74c022..75bf34fd9 100644 --- a/ports/cpp-peglib/portfile.cmake +++ b/ports/cpp-peglib/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-peglib diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake index f6bf753e5..6a8144b58 100644 --- a/ports/cpp-redis/portfile.cmake +++ b/ports/cpp-redis/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake index b445f4d47..63e1b9585 100644 --- a/ports/cppcodec/portfile.cmake +++ b/ports/cppcodec/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tplgy/cppcodec
diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake index 7f612e8ff..ce7c696ad 100644 --- a/ports/cppfs/portfile.cmake +++ b/ports/cppfs/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/cppfs @@ -40,5 +38,3 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright) - -vcpkg_test_cmake(PACKAGE_NAME cppfs) diff --git a/ports/cppkafka/portfile.cmake b/ports/cppkafka/portfile.cmake index fbb6e3bce..ccaee4ed4 100644 --- a/ports/cppkafka/portfile.cmake +++ b/ports/cppkafka/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mfontanini/cppkafka diff --git a/ports/cpptoml/portfile.cmake b/ports/cpptoml/portfile.cmake index 093feb9aa..62ea5fdec 100644 --- a/ports/cpptoml/portfile.cmake +++ b/ports/cpptoml/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO skystrife/cpptoml
diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake index b2b836f00..ab41ffcaf 100644 --- a/ports/cppunit/portfile.cmake +++ b/ports/cppunit/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "\n${PORT} does not support your system, only Windows for now. Please open a ticket issue on github.com/microsoft/vcpkg if necessary\n") endif() diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index 32e2bcec4..418d44502 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/cppzmq diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index 9b3db8e45..e41508f14 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
# On Windows, we can get a cpuinfo.dll, but it exports no symbols.
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@@ -55,6 +53,3 @@ endif() # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake index 8002707a6..debdde356 100644 --- a/ports/crfsuite/portfile.cmake +++ b/ports/crfsuite/portfile.cmake @@ -3,8 +3,6 @@ if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "ar endif() -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/croncpp/portfile.cmake b/ports/croncpp/portfile.cmake index dee210085..ebf35895b 100644 --- a/ports/croncpp/portfile.cmake +++ b/ports/croncpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariusbancila/croncpp - REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 + REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a HEAD_REF master PATCHES 0001-fix-cmake.patch @@ -21,6 +21,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/croncpp RENAME copyright) - -# # Post-build test for cmake libraries -vcpkg_test_cmake(PACKAGE_NAME croncpp) diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake index 5ee715e58..7e9b0c76f 100644 --- a/ports/crossguid/portfile.cmake +++ b/ports/crossguid/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index ff6f84d90..7c3f48ded 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ipkn/crow diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index b88f2e321..f2c42a876 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/cspice/portfile.cmake b/ports/cspice/portfile.cmake index 865325a7a..554c7b9d3 100644 --- a/ports/cspice/portfile.cmake +++ b/ports/cspice/portfile.cmake @@ -75,4 +75,4 @@ file( INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -)
\ No newline at end of file +) diff --git a/ports/ctbignum/portfile.cmake b/ports/ctbignum/portfile.cmake index 6d297117f..9bafbc9ba 100644 --- a/ports/ctbignum/portfile.cmake +++ b/ports/ctbignum/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO niekbouman/ctbignum diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake index 1efe110a3..f55a7c7e0 100644 --- a/ports/ctemplate/portfile.cmake +++ b/ports/ctemplate/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OlafvdSpek/ctemplate diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake index 834354fb5..d88d21b1d 100644 --- a/ports/ctre/portfile.cmake +++ b/ports/ctre/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake index 302bfb706..9d9416f27 100644 --- a/ports/cub/portfile.cmake +++ b/ports/cub/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 77154399c..01fc2cbef 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) message(FATAL_ERROR "This port is only for Windows Desktop or Linux") endif() diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index c80c3c180..9611908db 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -28,7 +28,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_copy_pdbs() -vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT}) file(INSTALL ${SOURCE_PATH}/doc/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}) diff --git a/ports/cute-headers/portfile.cmake b/ports/cute-headers/portfile.cmake index 703496d94..2153db229 100644 --- a/ports/cute-headers/portfile.cmake +++ b/ports/cute-headers/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO RandyGaul/cute_headers
diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake index c30c40dba..98d84ed31 100644 --- a/ports/cutelyst2/portfile.cmake +++ b/ports/cutelyst2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cutelyst/cutelyst diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake index 04680f66a..552e877d2 100644 --- a/ports/cxxopts/portfile.cmake +++ b/ports/cxxopts/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jarro2783/cxxopts diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake index a30449329..448008f0f 100644 --- a/ports/czmq/portfile.cmake +++ b/ports/czmq/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/czmq @@ -79,6 +77,3 @@ endif() # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake index d7eb7941c..7ed6e4d59 100644 --- a/ports/darts-clone/portfile.cmake +++ b/ports/darts-clone/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions)
vcpkg_check_linkage(
ONLY_STATIC_LIBRARY
)
diff --git a/ports/dbg-macro/portfile.cmake b/ports/dbg-macro/portfile.cmake index 3aee7268d..5c013e9d1 100644 --- a/ports/dbg-macro/portfile.cmake +++ b/ports/dbg-macro/portfile.cmake @@ -1,7 +1,5 @@ # single header file library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sharkdp/dbg-macro diff --git a/ports/dbow2/portfile.cmake b/ports/dbow2/portfile.cmake index c569e89ac..1518c7820 100644 --- a/ports/dbow2/portfile.cmake +++ b/ports/dbow2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/dbow3/portfile.cmake b/ports/dbow3/portfile.cmake index d867dd5cb..3b209b0f3 100644 --- a/ports/dbow3/portfile.cmake +++ b/ports/dbow3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - #the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 975b33b21..074c38a9f 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake index 5e685a4c3..d1646711f 100644 --- a/ports/detours/portfile.cmake +++ b/ports/detours/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake index 743da3e6a..c62478202 100644 --- a/ports/devicenameresolver/portfile.cmake +++ b/ports/devicenameresolver/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_bitbucket(
diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index b4d191bf8..9553f4de9 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO discordapp/discord-rpc diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake index 6a40d5105..bac98be81 100644 --- a/ports/discount/portfile.cmake +++ b/ports/discount/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
# No dynamic link for MSVC
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
diff --git a/ports/distorm/portfile.cmake b/ports/distorm/portfile.cmake index b1066ccd8..0b3cc5046 100644 --- a/ports/distorm/portfile.cmake +++ b/ports/distorm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gdabah/distorm
diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake index ec3a764d6..03c6fd637 100644 --- a/ports/docopt/portfile.cmake +++ b/ports/docopt/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO docopt/docopt.cpp diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index f5ebb4055..5ede45da1 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index 603ecd327..9ac5fa161 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -1,5 +1,3 @@ -INCLUDE(vcpkg_common_functions) - IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") ENDIF () @@ -43,5 +41,3 @@ FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/drlibs/portfile.cmake b/ports/drlibs/portfile.cmake index 3c50aff94..79347587e 100644 --- a/ports/drlibs/portfile.cmake +++ b/ports/drlibs/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs diff --git a/ports/dtl/portfile.cmake b/ports/dtl/portfile.cmake index d66360991..d36e30760 100644 --- a/ports/dtl/portfile.cmake +++ b/ports/dtl/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) include(CMakePackageConfigHelpers) vcpkg_from_github( diff --git a/ports/duckx/portfile.cmake b/ports/duckx/portfile.cmake index ae1b78b58..be1170ea3 100644 --- a/ports/duckx/portfile.cmake +++ b/ports/duckx/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO amiremohamadi/DuckX diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake index 5556d22cd..e4153b133 100644 --- a/ports/duilib/portfile.cmake +++ b/ports/duilib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO duilib/duilib
diff --git a/ports/dx/portfile.cmake b/ports/dx/portfile.cmake index ee8eadcc7..61500c5c0 100644 --- a/ports/dx/portfile.cmake +++ b/ports/dx/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sdcb/dx diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index a14d29d9b..4d0a878e3 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") diff --git a/ports/easycl/portfile.cmake b/ports/easycl/portfile.cmake index 694a853bb..554639473 100644 --- a/ports/easycl/portfile.cmake +++ b/ports/easycl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO architector1324/EasyCL diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index d74457880..2b142cd39 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if (NOT VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "easyhook only support windows.")
endif()
diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 56ba406b7..6df99d27d 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index dd70f4d51..944dcb00c 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake index 28a9708ae..f5b283a1a 100644 --- a/ports/effolkronium-random/portfile.cmake +++ b/ports/effolkronium-random/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO effolkronium/random diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake index 446f379f0..728d73b86 100644 --- a/ports/embree2/portfile.cmake +++ b/ports/embree2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO embree/embree diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index 326a21bdf..d0f83eef4 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/esaxx/portfile.cmake b/ports/esaxx/portfile.cmake index 93e24ff36..c81a2b1f5 100644 --- a/ports/esaxx/portfile.cmake +++ b/ports/esaxx/portfile.cmake @@ -1,6 +1,4 @@ #header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO hillbig/esaxx
diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake index b8f1ac440..fcd73e9b7 100644 --- a/ports/expected-lite/portfile.cmake +++ b/ports/expected-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/expected-lite
diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index 22c728661..eb3d16a7d 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk diff --git a/ports/fadbad/portfile.cmake b/ports/fadbad/portfile.cmake index db947be82..35c0ff8f5 100644 --- a/ports/fadbad/portfile.cmake +++ b/ports/fadbad/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.fadbad.com/download/FADBAD++-2.1.tar.gz" FILENAME "FADBAD++-2.1.tar.gz" diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index de4af3550..6aaf772a0 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/fast-cpp-csv-parser/portfile.cmake b/ports/fast-cpp-csv-parser/portfile.cmake index be3ef7e88..200e767cd 100644 --- a/ports/fast-cpp-csv-parser/portfile.cmake +++ b/ports/fast-cpp-csv-parser/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ben-strasser/fast-cpp-csv-parser diff --git a/ports/fastfeat/portfile.cmake b/ports/fastfeat/portfile.cmake index 7fd35b9f8..18ec525ca 100644 --- a/ports/fastfeat/portfile.cmake +++ b/ports/fastfeat/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO edrosten/fast-C-src
diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index 38c71aade..0c4c97d08 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake index 000c00b1f..90c4ba546 100644 --- a/ports/fdk-aac/portfile.cmake +++ b/ports/fdk-aac/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake index 7bbd21f06..f822cef95 100644 --- a/ports/fdlibm/portfile.cmake +++ b/ports/fdlibm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://android.googlesource.com/platform/external/fdlibm diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index ec9637212..45682e9d7 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - #the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg. #Since it's its author choice, we should not disallow it, but unfortunately looks like it's broken, so we block it anyway... vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index a60227617..4852dcbec 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(FLINT_VERSION 2.5.2) set(FLINT_HASH "8606b369af505d5fcedd05d95fcd04afac2a916fc5291501c56785891cfdb2f9bc98700b2d05afd1d9482fb96df2a8c8bf1cd0e5696df46775df9fa743eb900b") diff --git a/ports/fmem/portfile.cmake b/ports/fmem/portfile.cmake index b3b5faa83..36e4e45f3 100644 --- a/ports/fmem/portfile.cmake +++ b/ports/fmem/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-libs/fmem diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake index 6babc78ed..02a9bdc31 100644 --- a/ports/fmi4cpp/portfile.cmake +++ b/ports/fmi4cpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NTNU-IHB/FMI4cpp diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index 0f3a4f290..6164254aa 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index f8fdeea33..170eb4369 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
# WINDOWS_EXPORT_ALL_SYMBOLS doesn't work.
# unresolved external symbol "public: static unsigned int const foonathan::memory::detail::memory_block_stack::implementation_offset
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@@ -125,6 +123,3 @@ endif() # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index 9201f1850..db352b985 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest diff --git a/ports/fplus/portfile.cmake b/ports/fplus/portfile.cmake index fc7da4cbc..4dfc776a4 100644 --- a/ports/fplus/portfile.cmake +++ b/ports/fplus/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Dobiasd/FunctionalPlus
diff --git a/ports/g3log/portfile.cmake b/ports/g3log/portfile.cmake index f0ae8a23a..2d529f014 100644 --- a/ports/g3log/portfile.cmake +++ b/ports/g3log/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KjellKod/g3log
@@ -36,6 +34,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME g3logger)
diff --git a/ports/gainput/portfile.cmake b/ports/gainput/portfile.cmake index 4c568f171..65ded761c 100644 --- a/ports/gainput/portfile.cmake +++ b/ports/gainput/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/gainput diff --git a/ports/gaussianlib/portfile.cmake b/ports/gaussianlib/portfile.cmake index 219196738..45f6b7ff4 100644 --- a/ports/gaussianlib/portfile.cmake +++ b/ports/gaussianlib/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LukasBanana/GaussianLib
diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 7a72623a7..095dab590 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(GDK_PIXBUF_VERSION 2.36) diff --git a/ports/genann/portfile.cmake b/ports/genann/portfile.cmake index 4f1c21d06..56bcd4aee 100644 --- a/ports/genann/portfile.cmake +++ b/ports/genann/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 87053f849..82f651351 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -2,8 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gflags/gflags diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake index adb13076d..68c2049d1 100644 --- a/ports/gherkin-c/portfile.cmake +++ b/ports/gherkin-c/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO c-libs/gherkin-c
- REF dd180edc7d092311f2e90a0c4957061156d39dd3 + REF dd180edc7d092311f2e90a0c4957061156d39dd3
SHA512 c6b38ab0e7a0fd1061d86b0ff9d9140f8c3d6f15cfc1673e947254c6c03a66d3e6aae5b267b074aa10fa30ba2850190c9e9ea7c12e340e4f8c5575b9bf31bab3
HEAD_REF master
)
diff --git a/ports/gl2ps/portfile.cmake b/ports/gl2ps/portfile.cmake index eaee56270..a66e1d2ff 100644 --- a/ports/gl2ps/portfile.cmake +++ b/ports/gl2ps/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_gitlab( GITLAB_URL http://gitlab.onelab.info OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index d53fc61b1..da12c18cb 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skaslev/gl3w diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 863426282..78484437b 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/glbinding diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 157557438..12ef30059 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/globjects diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 1bb8121b1..2d5303910 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -33,5 +31,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # Handle copyright file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang) - -vcpkg_test_cmake(PACKAGE_NAME glslang) diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index 524bd78c9..ac471e875 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(LIB_NAME gmime) set(LIB_VERSION 3.2.6) diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index ec4d3cb2b..b09ba8c84 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "Intel gmmlib currently only supports Linux platforms") endif() diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake index a90959f5d..67b8a2231 100644 --- a/ports/graphqlparser/portfile.cmake +++ b/ports/graphqlparser/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO graphql/libgraphqlparser
diff --git a/ports/greatest/portfile.cmake b/ports/greatest/portfile.cmake index 479287ccb..2fcfd0645 100644 --- a/ports/greatest/portfile.cmake +++ b/ports/greatest/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO silentbicycle/greatest diff --git a/ports/grppi/portfile.cmake b/ports/grppi/portfile.cmake index 6b1895d0f..058f39fd0 100644 --- a/ports/grppi/portfile.cmake +++ b/ports/grppi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arcosuc3m/grppi
diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index d77bee058..92f69ca8f 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,5 +1,4 @@ -include(vcpkg_common_functions) set(GTK_VERSION 3.22.19) vcpkg_download_distfile(ARCHIVE diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index feedbf288..4593ebcae 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -2,8 +2,6 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Error: UWP builds are currently not supported.") endif() -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake index 0cf84000e..d22602418 100644 --- a/ports/guetzli/portfile.cmake +++ b/ports/guetzli/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake index 715decc23..55ece8267 100644 --- a/ports/gumbo/portfile.cmake +++ b/ports/gumbo/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/hayai/portfile.cmake b/ports/hayai/portfile.cmake index c175d6633..4fa698d18 100644 --- a/ports/hayai/portfile.cmake +++ b/ports/hayai/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -65,6 +63,3 @@ endif() # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/hedley/portfile.cmake b/ports/hedley/portfile.cmake index e06e9630a..b724a0bea 100644 --- a/ports/hedley/portfile.cmake +++ b/ports/hedley/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemequ/hedley diff --git a/ports/hfsm2/portfile.cmake b/ports/hfsm2/portfile.cmake index 0970d0111..48275078b 100644 --- a/ports/hfsm2/portfile.cmake +++ b/ports/hfsm2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrew-gresyk/HFSM2 diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 93969227d..ec7abb495 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libusb/hidapi
diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index 2d79274ef..6c73deff5 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BlueBrain/HighFive diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index d6ae1cdc0..9aa591773 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index 0d550756e..dc02cdb2e 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/ideviceinstaller/portfile.cmake b/ports/ideviceinstaller/portfile.cmake index c5523e6ba..869ada8d5 100644 --- a/ports/ideviceinstaller/portfile.cmake +++ b/ports/ideviceinstaller/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/ideviceinstaller
diff --git a/ports/if97/portfile.cmake b/ports/if97/portfile.cmake index c07d11e5c..57c2b5c55 100644 --- a/ports/if97/portfile.cmake +++ b/ports/if97/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CoolProp/IF97 diff --git a/ports/igloo/portfile.cmake b/ports/igloo/portfile.cmake index a1ab17576..6a9ce3881 100644 --- a/ports/igloo/portfile.cmake +++ b/ports/igloo/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO joakimkarlsson/igloo
diff --git a/ports/ignition-cmake0/portfile.cmake b/ports/ignition-cmake0/portfile.cmake index 795436f95..c57d7b03e 100644 --- a/ports/ignition-cmake0/portfile.cmake +++ b/ports/ignition-cmake0/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
set(PACKAGE_VERSION "0.6.1")
diff --git a/ports/ignition-common1/portfile.cmake b/ports/ignition-common1/portfile.cmake index 28f40c4aa..205673123 100644 --- a/ports/ignition-common1/portfile.cmake +++ b/ports/ignition-common1/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) ignition_modular_library(NAME common diff --git a/ports/ignition-math4/portfile.cmake b/ports/ignition-math4/portfile.cmake index 69a50abdd..8d5148477 100644 --- a/ports/ignition-math4/portfile.cmake +++ b/ports/ignition-math4/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake)
ignition_modular_library(NAME math
diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index da2a40bad..10c1e6073 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arximboldi/immer
diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake index cf54772b7..471b35f86 100644 --- a/ports/inih/portfile.cmake +++ b/ports/inih/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/intel-ipsec/portfile.cmake b/ports/intel-ipsec/portfile.cmake index 501239b70..3218d67b0 100644 --- a/ports/intel-ipsec/portfile.cmake +++ b/ports/intel-ipsec/portfile.cmake @@ -56,5 +56,3 @@ FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR} FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -#VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/intelrdfpmathlib/portfile.cmake b/ports/intelrdfpmathlib/portfile.cmake index fc9b0ed13..9aad26f84 100644 --- a/ports/intelrdfpmathlib/portfile.cmake +++ b/ports/intelrdfpmathlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
diff --git a/ports/isal/portfile.cmake b/ports/isal/portfile.cmake index 0fbb6f628..0703b7246 100644 --- a/ports/isal/portfile.cmake +++ b/ports/isal/portfile.cmake @@ -1,5 +1,3 @@ -INCLUDE(vcpkg_common_functions) - IF (NOT VCPKG_CMAKE_SYSTEM_NAME) SET(EXEC_ENV "Windows") ELSE () @@ -46,5 +44,3 @@ FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR} FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -#VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index 890df8b31..cc19e902b 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mdadams/jasper diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake index 5633e9030..099252b20 100644 --- a/ports/jbig2dec/portfile.cmake +++ b/ports/jbig2dec/portfile.cmake @@ -1,11 +1,9 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ArtifexSoftware/jbig2dec
- REF 1c336b8ab44524dc56ea837e2211ff4207704cdd # 0.19 + REF 1c336b8ab44524dc56ea837e2211ff4207704cdd # 0.19
SHA512 e189a80cc8da18813cf6c8edc6f1a799793adcba7ea6f302a8cced349bffac68869af338d9723ee1efdc07115ae554cd5757bfda7d7ac41324fde1f9c3a8343c
HEAD_REF master
)
diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index 25c87930a..ba2d6555a 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(JBIGKIT_VERSION 2.1) diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake index 49e89b8d0..013634577 100644 --- a/ports/jemalloc/portfile.cmake +++ b/ports/jemalloc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/jinja2cpplight/portfile.cmake b/ports/jinja2cpplight/portfile.cmake index 49eff2034..329020de2 100644 --- a/ports/jinja2cpplight/portfile.cmake +++ b/ports/jinja2cpplight/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_TARGET_IS_UWP) message(FATAL_ERROR "jinja2cpplight doesn't support UWP.") endif() diff --git a/ports/jsmn/portfile.cmake b/ports/jsmn/portfile.cmake index 0b7599ccb..a8deec69e 100644 --- a/ports/jsmn/portfile.cmake +++ b/ports/jsmn/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zserge/jsmn diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index 308b5e43c..d0893ebee 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -22,6 +22,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index 9d2f24073..658cb92a4 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO png85/json_spirit
diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake index a3c2b9cab..9d1c459bc 100644 --- a/ports/json11/portfile.cmake +++ b/ports/json11/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index 7043acf5c..1204f8554 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru diff --git a/ports/kcp/portfile.cmake b/ports/kcp/portfile.cmake index e857606ba..283b9fd66 100644 --- a/ports/kcp/portfile.cmake +++ b/ports/kcp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/keystone/portfile.cmake b/ports/keystone/portfile.cmake index 5f56e8d9a..f75cfeeea 100644 --- a/ports/keystone/portfile.cmake +++ b/ports/keystone/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO keystone-engine/keystone diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake index 5aec50119..cde6b6148 100644 --- a/ports/kinectsdk1/portfile.cmake +++ b/ports/kinectsdk1/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() diff --git a/ports/kinectsdk2/portfile.cmake b/ports/kinectsdk2/portfile.cmake index fc42bb99b..3ed210172 100644 --- a/ports/kinectsdk2/portfile.cmake +++ b/ports/kinectsdk2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_buildpath_length_warning(37) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") diff --git a/ports/kvasir-mpl/portfile.cmake b/ports/kvasir-mpl/portfile.cmake index b5076e9bf..7208bcc8a 100644 --- a/ports/kvasir-mpl/portfile.cmake +++ b/ports/kvasir-mpl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kvasir-io/mpl diff --git a/ports/lastools/portfile.cmake b/ports/lastools/portfile.cmake index c3b4eb246..c21fb939e 100644 --- a/ports/lastools/portfile.cmake +++ b/ports/lastools/portfile.cmake @@ -2,8 +2,6 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} doesn't currently support UWP.")
endif()
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/laszip/portfile.cmake b/ports/laszip/portfile.cmake index 7d9c07cce..0628411a8 100644 --- a/ports/laszip/portfile.cmake +++ b/ports/laszip/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LASzip/LASzip
- REF 1ab671e42ff1f086e29d5b7e300a5026e7b8d69b # 3.4.3 + REF 1ab671e42ff1f086e29d5b7e300a5026e7b8d69b # 3.4.3
SHA512 7ec20d6999b16e6a74a64d1dc3e9f1b1b4510acd306d30ccae34a543ca0dc52e1d1d989279fafdda321616ba1e0ceb59a093d8c61ba5a586b760efa0d00a0184
HEAD_REF master
)
diff --git a/ports/lazy-importer/portfile.cmake b/ports/lazy-importer/portfile.cmake index 076bb7c34..23efa3c1f 100644 --- a/ports/lazy-importer/portfile.cmake +++ b/ports/lazy-importer/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/lazy_importer diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 929fda173..6805e4b11 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ADDITIONAL_PATCH "shared.patch") endif() diff --git a/ports/leaf/portfile.cmake b/ports/leaf/portfile.cmake index 4d5c129bf..cb87093ea 100644 --- a/ports/leaf/portfile.cmake +++ b/ports/leaf/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zajo/leaf
diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake index d5948d97b..2737d3695 100644 --- a/ports/lest/portfile.cmake +++ b/ports/lest/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/lest
- REF v1.35.1 + REF v1.35.1
SHA512 06b786cbca37cb4d20737d040176bf34398090d566310b88558b788804d8b832c682f1814f5c68ef11192243dbde5643e73b78be4fb1407b831bcde43adb002c
)
diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake index a40ba6a02..4f20f837b 100644 --- a/ports/leveldb/portfile.cmake +++ b/ports/leveldb/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "leveldb doesn't supports UWP")
endif()
diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake index c7a9ef42e..a50abed94 100644 --- a/ports/libbf/portfile.cmake +++ b/ports/libbf/portfile.cmake @@ -2,8 +2,6 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR message(FATAL_ERROR "libbf does not support MSVC") endif() -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mavam/libbf diff --git a/ports/libcds/portfile.cmake b/ports/libcds/portfile.cmake index ebb87b538..4cdf9f267 100644 --- a/ports/libcds/portfile.cmake +++ b/ports/libcds/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO khizmax/libcds diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake index 20e3c7c70..199e396e9 100644 --- a/ports/libcerf/portfile.cmake +++ b/ports/libcerf/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(BUILD_SHARED_LIBS ON)
else()
@@ -31,5 +29,3 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright)
-
-vcpkg_test_cmake(PACKAGE_NAME libcerf)
diff --git a/ports/libconfuse/portfile.cmake b/ports/libconfuse/portfile.cmake index 01c6290cd..ac49ff157 100644 --- a/ports/libconfuse/portfile.cmake +++ b/ports/libconfuse/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinh/libconfuse
@@ -38,6 +36,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index b5c332306..dd4816b52 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "https://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.13.tar.xz"
FILENAME "libcroco-0.6.13.tar.xz"
@@ -31,6 +29,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright)
vcpkg_copy_pdbs()
-
-# Post-build test for cmake libraries
-vcpkg_test_cmake(PACKAGE_NAME libcroco)
diff --git a/ports/libcuckoo/portfile.cmake b/ports/libcuckoo/portfile.cmake index 15d6df316..a1a03c841 100644 --- a/ports/libcuckoo/portfile.cmake +++ b/ports/libcuckoo/portfile.cmake @@ -1,7 +1,5 @@ # Header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO efficient/libcuckoo
@@ -29,6 +27,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index 74b8bbd80..452b66a17 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -1,7 +1,5 @@ set(LIBDATRIE_VERSION 0.2.10) -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${LIBDATRIE_VERSION}.tar.xz" FILENAME "libdatrie-${LIBDATRIE_VERSION}.tar.xz" diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake index fa0e2d8a8..136be4d21 100644 --- a/ports/libdshowcapture/portfile.cmake +++ b/ports/libdshowcapture/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO obsproject/libdshowcapture diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake index 318e21a9e..a4a3b0c87 100644 --- a/ports/libftdi/portfile.cmake +++ b/ports/libftdi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz"
FILENAME "libftdi-0.20.tar.gz"
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 1a25969e3..a297c54fb 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgd/libgd diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake index 1bbe6325c..1e4b0f951 100644 --- a/ports/libgta/portfile.cmake +++ b/ports/libgta/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(LIBGTA_VERSION 1.0.8) set(LIBGTA_HASH 99ec3d6317c9a12cf440a60bb989cc7a3fe35e0a1da3e65206e5cd52b69fb860850e61ea0f819511ef48ddc87c468c0ded710409990627096738886e1b358423) diff --git a/ports/libhydrogen/portfile.cmake b/ports/libhydrogen/portfile.cmake index 7dbcd3537..bf746bbbc 100644 --- a/ports/libhydrogen/portfile.cmake +++ b/ports/libhydrogen/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -22,6 +20,3 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/hydrogen TARGET_PATH share/hyd file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME hydrogen) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index b36c995b6..934e2f7b0 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -41,6 +41,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURR file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) - set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index b0a1ffaea..4536ed7cd 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -1,8 +1,7 @@ -include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO svi-opensource/libics
- REF 807193979650ab3d474e9a4bf907cf046eb0f3f0 # 1.6.4 + REF 807193979650ab3d474e9a4bf907cf046eb0f3f0 # 1.6.4
SHA512 9fcbc14d4b62a8f5c6c114123a5cd3102c3398dd25f44caf07d033dbfc8304fc22dcde35e545ed984047a6009a0e7d7e30cbb6075fb10b9ceda0311cabc56ecb
HEAD_REF master
)
diff --git a/ports/libirecovery/portfile.cmake b/ports/libirecovery/portfile.cmake index 508150b07..5fd9c0ee8 100644 --- a/ports/libirecovery/portfile.cmake +++ b/ports/libirecovery/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
diff --git a/ports/liblbfgs/portfile.cmake b/ports/liblbfgs/portfile.cmake index ccb648720..5e7e34e55 100644 --- a/ports/liblbfgs/portfile.cmake +++ b/ports/liblbfgs/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chokkan/liblbfgs diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake index 4a9b4b6a0..b48f03cd8 100644 --- a/ports/liblinear/portfile.cmake +++ b/ports/liblinear/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cjlin1/liblinear
- REF 2381122d05bbb1e4ee24b522298dd548f0ec0d24 #v241 + REF 2381122d05bbb1e4ee24b522298dd548f0ec0d24 #v241
SHA512 ee784b6325681b3d9e3dc0b59f4a703d87be35fb898cc16df93e4a814a959d530736a8451be4f0f2c856769d81e3f5acbcd6f0f8677425e700597e3502f9f36d
HEAD_REF master
)
diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index e1eb7babf..9d02b6599 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO radarsat1/liblo diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index bd1afddf1..cbeb710e2 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
set(VCPKG_LIBRARY_LINKAGE dynamic)
vcpkg_from_github(
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 9cc8e5ac3..261544349 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -1,7 +1,5 @@ set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d)
-include(vcpkg_common_functions)
-
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
vcpkg_from_github(ARCHIVE
OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/libmorton/portfile.cmake b/ports/libmorton/portfile.cmake index 4738014e3..dee3b6e62 100644 --- a/ports/libmorton/portfile.cmake +++ b/ports/libmorton/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Forceflow/libmorton diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake index 3da56e9cc..f4f19e7c3 100644 --- a/ports/libmspack/portfile.cmake +++ b/ports/libmspack/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(LIB_NAME libmspack) set(LIB_VERSION 0.10.1alpha) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index c8a720340..29e58fd13 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.gz" FILENAME "libodb-pgsql-2.4.0.tar.gz" diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 113307abe..d99001a09 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-sqlite-2.4.0.tar.gz" FILENAME "libodb-sqlite-2.4.0.tar.gz" diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index d616f1b35..e790ef554 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) include(CMakePackageConfigHelpers) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index 617a8a65a..e493687c3 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/ogg diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index c446c8f83..76cb968dc 100644 --- a/ports/libopenmpt/portfile.cmake +++ b/ports/libopenmpt/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Windowstore not supported") endif() diff --git a/ports/libopusenc/portfile.cmake b/ports/libopusenc/portfile.cmake index f3c226aea..7a4eacee4 100644 --- a/ports/libopusenc/portfile.cmake +++ b/ports/libopusenc/portfile.cmake @@ -2,7 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "UWP builds not supported") endif() -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/libopusenc diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake index 6d327d8a5..5a3e81388 100644 --- a/ports/libpff/portfile.cmake +++ b/ports/libpff/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(LIB_VERSION 20180714) diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake index 702fe8be0..ad32f08c7 100644 --- a/ports/libraqm/portfile.cmake +++ b/ports/libraqm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(RAQM_VERSION_MAJOR 0)
@@ -33,6 +31,3 @@ vcpkg_copy_pdbs() # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraqm RENAME copyright)
-
-# Post-build test for cmake libraries
-vcpkg_test_cmake(PACKAGE_NAME raqm)
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 73c60460e..ffedcf0d2 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LibRaw/LibRaw diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index 4c7633066..2720c5011 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -27,5 +27,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-#vcpkg_test_cmake(PACKAGE_NAME unofficial-librsvg)
diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake index 6344688e4..f3b865c4f 100644 --- a/ports/librsync/portfile.cmake +++ b/ports/librsync/portfile.cmake @@ -38,4 +38,4 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
)
-vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs()
diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 707e59010..e7214e0ba 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,6 +1,4 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
FILENAME "libsigc++-2.10.0.tar.xz"
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 2d61a4550..e2d832383 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium @@ -55,5 +53,3 @@ configure_file( ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY ) - -#vcpkg_test_cmake(PACKAGE_NAME unofficial-sodium) diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index e28aa40c6..acf4d9fc6 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -39,5 +39,3 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsoundio RENAME copyright)
-
-vcpkg_test_cmake(PACKAGE_NAME libsoundio)
diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake index f71182d62..3c800b49a 100644 --- a/ports/libspatialindex/portfile.cmake +++ b/ports/libspatialindex/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libspatialindex/libspatialindex diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 043fce90b..b5c818ae0 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) set(LIBSPATIALITE_VERSION_STR "4.3.0a") vcpkg_download_distfile(ARCHIVE URLS "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 4d6ec0211..88a13b885 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cisco/libsrtp
diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index de3cee534..0922bb7c8 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 diff --git a/ports/libstemmer/portfile.cmake b/ports/libstemmer/portfile.cmake index 68580f440..e28f90cc5 100644 --- a/ports/libstemmer/portfile.cmake +++ b/ports/libstemmer/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake index 84b929773..ffb9eeb8b 100644 --- a/ports/libstk/portfile.cmake +++ b/ports/libstk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -31,6 +29,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/li file(GLOB RAWFILES ${SOURCE_PATH}/rawwaves/*.raw) file(COPY ${RAWFILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves) - -# Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME libstk) diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index e473fd3c3..fe15e57bf 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cjlin1/libsvm
@@ -38,6 +36,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake index 53f8d67c7..8c88e261b 100644 --- a/ports/libtheora/portfile.cmake +++ b/ports/libtheora/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/theora diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 82ce84166..ae783e53b 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mfontanini/libtins @@ -36,6 +34,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtins RENAME copyright) - -# Post-build test for cmake libraries -vcpkg_test_cmake(PACKAGE_NAME libtins) diff --git a/ports/libu2f-server/portfile.cmake b/ports/libu2f-server/portfile.cmake index e4f7c6ddb..6893718db 100644 --- a/ports/libu2f-server/portfile.cmake +++ b/ports/libu2f-server/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/libudis86/portfile.cmake b/ports/libudis86/portfile.cmake index a4f5aa9d7..a1ae6e539 100644 --- a/ports/libudis86/portfile.cmake +++ b/ports/libudis86/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vmt/udis86 diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake index 77c2d44df..9ac341e01 100644 --- a/ports/libui/portfile.cmake +++ b/ports/libui/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andlabs/libui diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index 52af1c5e5..883a58c55 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 024933ec5..9e8d4c907 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebm diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index 1b31ed225..da2448a98 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(LIBXMLPP_VERSION 2.40.1) diff --git a/ports/libzen/portfile.cmake b/ports/libzen/portfile.cmake index 1a9bf9b2a..f7770454c 100644 --- a/ports/libzen/portfile.cmake +++ b/ports/libzen/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() @@ -25,5 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libzen RENAME copyright) - -vcpkg_test_cmake(PACKAGE_NAME ZenLib MODULE) diff --git a/ports/linalg/portfile.cmake b/ports/linalg/portfile.cmake index 4f2777755..23ae4c83c 100644 --- a/ports/linalg/portfile.cmake +++ b/ports/linalg/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sgorsten/linalg diff --git a/ports/linenoise-ng/portfile.cmake b/ports/linenoise-ng/portfile.cmake index 18dcfd262..e0d1db928 100644 --- a/ports/linenoise-ng/portfile.cmake +++ b/ports/linenoise-ng/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arangodb/linenoise-ng
diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index c41de8b45..ddafdc9de 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} currently doesn't supports UWP.") endif() diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index a62849668..632d7a59e 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb diff --git a/ports/luabridge/portfile.cmake b/ports/luabridge/portfile.cmake index b854f9fee..6f4cbeb2a 100644 --- a/ports/luabridge/portfile.cmake +++ b/ports/luabridge/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vinniefalco/LuaBridge diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index 4427b6dad..5b4bc3400 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO diegonehab/luasocket diff --git a/ports/lzfse/portfile.cmake b/ports/lzfse/portfile.cmake index 65a17927e..9ce60eeeb 100644 --- a/ports/lzfse/portfile.cmake +++ b/ports/lzfse/portfile.cmake @@ -2,7 +2,6 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") message(FATAL_ERROR "ARM build not supported") endif() -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lzfse/lzfse diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 7ccc62829..7c09aaf0c 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz" FILENAME "lzo-2.10.tar.gz" diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index d2a0af3d4..eda78782e 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-extras diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake index 9bb8a64de..66295137f 100644 --- a/ports/magnum-integration/portfile.cmake +++ b/ports/magnum-integration/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/magnum-integration diff --git a/ports/mapbox-variant/portfile.cmake b/ports/mapbox-variant/portfile.cmake index 1365e362a..dc696454e 100644 --- a/ports/mapbox-variant/portfile.cmake +++ b/ports/mapbox-variant/portfile.cmake @@ -1,6 +1,4 @@ # header-only
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mapbox/variant
diff --git a/ports/mathc/portfile.cmake b/ports/mathc/portfile.cmake index 7b3d263e2..fde284632 100644 --- a/ports/mathc/portfile.cmake +++ b/ports/mathc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 2d73da347..72dc41c1f 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index cb62df441..2a729f0ed 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "matroska does not currently support UWP") endif() diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index c37b07a20..e29329442 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-765.30.11.tar.gz FILENAME mDNSResponder-765.30.11.tar.gz diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake index 849377616..6bf020945 100644 --- a/ports/mecab/portfile.cmake +++ b/ports/mecab/portfile.cmake @@ -2,8 +2,6 @@ if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "ar message(FATAL_ERROR "mecab does not support on this platform")
endif()
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taku910/mecab
diff --git a/ports/meschach/portfile.cmake b/ports/meschach/portfile.cmake index 6c4a6f6c0..5bbcff8fa 100644 --- a/ports/meschach/portfile.cmake +++ b/ports/meschach/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/mgnlibs/portfile.cmake b/ports/mgnlibs/portfile.cmake index e49a122e7..cd5ee8d21 100644 --- a/ports/mgnlibs/portfile.cmake +++ b/ports/mgnlibs/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattiasgustavsson/libs diff --git a/ports/mhook/portfile.cmake b/ports/mhook/portfile.cmake index db42cc22b..51b47c316 100644 --- a/ports/mhook/portfile.cmake +++ b/ports/mhook/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apriorit/mhook diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake index b154a59df..63ce4e7c5 100644 --- a/ports/milerius-sfml-imgui/portfile.cmake +++ b/ports/milerius-sfml-imgui/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index d4ea8c676..26b813889 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
diff --git a/ports/minimp3/portfile.cmake b/ports/minimp3/portfile.cmake index 8bc4e7e37..75320ef58 100644 --- a/ports/minimp3/portfile.cmake +++ b/ports/minimp3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lieff/minimp3
diff --git a/ports/minisat-master-keying/portfile.cmake b/ports/minisat-master-keying/portfile.cmake index 0578623c1..34bd4ca95 100644 --- a/ports/minisat-master-keying/portfile.cmake +++ b/ports/minisat-master-keying/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/minitrace/portfile.cmake b/ports/minitrace/portfile.cmake index 9410ed84f..444ae3188 100644 --- a/ports/minitrace/portfile.cmake +++ b/ports/minitrace/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -24,5 +22,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/minitrace RENAME copyright)
-
-vcpkg_test_cmake(PACKAGE_NAME minitrace)
diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake index 1b886b957..b8c3ab7b9 100644 --- a/ports/miniupnpc/portfile.cmake +++ b/ports/miniupnpc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO miniupnp/miniupnp
diff --git a/ports/mio/portfile.cmake b/ports/mio/portfile.cmake index 9c7e25939..4ec8b8963 100644 --- a/ports/mio/portfile.cmake +++ b/ports/mio/portfile.cmake @@ -1,6 +1,4 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mandreyel/mio
diff --git a/ports/mman/portfile.cmake b/ports/mman/portfile.cmake index 5918d370a..7482a7f74 100644 --- a/ports/mman/portfile.cmake +++ b/ports/mman/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO witwall/mman-win32
diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake index 663ad6df2..b3bdda6ff 100644 --- a/ports/moos-core/portfile.cmake +++ b/ports/moos-core/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( diff --git a/ports/moos-essential/portfile.cmake b/ports/moos-essential/portfile.cmake index 634b1530e..daebe0f04 100644 --- a/ports/moos-essential/portfile.cmake +++ b/ports/moos-essential/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO themoos/essential-moos diff --git a/ports/moos-ui/portfile.cmake b/ports/moos-ui/portfile.cmake index 55cbebb7f..e3f0dd4ee 100644 --- a/ports/moos-ui/portfile.cmake +++ b/ports/moos-ui/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO themoos/ui-moos diff --git a/ports/mpark-variant/portfile.cmake b/ports/mpark-variant/portfile.cmake index c6010356e..2041e6f07 100644 --- a/ports/mpark-variant/portfile.cmake +++ b/ports/mpark-variant/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpark/variant diff --git a/ports/mpi/portfile.cmake b/ports/mpi/portfile.cmake index e46edeb43..065116c27 100644 --- a/ports/mpi/portfile.cmake +++ b/ports/mpi/portfile.cmake @@ -1,3 +1 @@ -include(vcpkg_common_functions) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/mpmcqueue/portfile.cmake b/ports/mpmcqueue/portfile.cmake index be2f03064..f1fe1d3a0 100644 --- a/ports/mpmcqueue/portfile.cmake +++ b/ports/mpmcqueue/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rigtorp/MPMCQueue diff --git a/ports/msinttypes/portfile.cmake b/ports/msinttypes/portfile.cmake index 9393ea5f9..beb6ea711 100644 --- a/ports/msinttypes/portfile.cmake +++ b/ports/msinttypes/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chemeris/msinttypes diff --git a/ports/mujs/portfile.cmake b/ports/mujs/portfile.cmake index f9eff13b5..3475307dc 100644 --- a/ports/mujs/portfile.cmake +++ b/ports/mujs/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake index f1cb824a7..06c899c5e 100644 --- a/ports/nanogui/portfile.cmake +++ b/ports/nanogui/portfile.cmake @@ -22,4 +22,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index a4125434d..49fdab38e 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nanomsg diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake index 35d662c40..5a536e619 100644 --- a/ports/nanopb/portfile.cmake +++ b/ports/nanopb/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
message(WARNING "\
diff --git a/ports/nanorange/portfile.cmake b/ports/nanorange/portfile.cmake index aa039c3cf..c516ecb80 100644 --- a/ports/nanorange/portfile.cmake +++ b/ports/nanorange/portfile.cmake @@ -1,6 +1,4 @@ # header-only
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tcbrindle/NanoRange
diff --git a/ports/nanort/portfile.cmake b/ports/nanort/portfile.cmake index 3c9ff0295..d6e774a52 100644 --- a/ports/nanort/portfile.cmake +++ b/ports/nanort/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lighttransport/nanort diff --git a/ports/nativefiledialog/portfile.cmake b/ports/nativefiledialog/portfile.cmake index f8e0faae1..f0f8762be 100644 --- a/ports/nativefiledialog/portfile.cmake +++ b/ports/nativefiledialog/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} does not currently support UWP")
endif()
@@ -36,6 +34,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/networkdirect-sdk/portfile.cmake b/ports/networkdirect-sdk/portfile.cmake index bb893ed90..666a31be4 100644 --- a/ports/networkdirect-sdk/portfile.cmake +++ b/ports/networkdirect-sdk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
#only supports windows
if (VCPKG_CMAKE_SYSTEM_NAME)
message(FATAL_ERROR "networkDirect-sdk only supports windows")
diff --git a/ports/nonius/portfile.cmake b/ports/nonius/portfile.cmake index ca7f7b5ae..9b55dc1a8 100644 --- a/ports/nonius/portfile.cmake +++ b/ports/nonius/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libnonius/nonius
diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake index 447f9065c..22ae9c4af 100644 --- a/ports/nrf-ble-driver/portfile.cmake +++ b/ports/nrf-ble-driver/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") message( "${PORT} currently requires the following libraries from the system package manager: diff --git a/ports/nt-wrapper/portfile.cmake b/ports/nt-wrapper/portfile.cmake index 7ed8146ff..78c84358d 100644 --- a/ports/nt-wrapper/portfile.cmake +++ b/ports/nt-wrapper/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/nt_wrapper diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index 6e9806d8a..7c8f47590 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vurtun/nuklear diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake index 3319d282f..73215a441 100644 --- a/ports/numactl/portfile.cmake +++ b/ports/numactl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO numactl/numactl diff --git a/ports/observer-ptr-lite/portfile.cmake b/ports/observer-ptr-lite/portfile.cmake index 4fea768f5..60b42bcab 100644 --- a/ports/observer-ptr-lite/portfile.cmake +++ b/ports/observer-ptr-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/observer-ptr-lite
diff --git a/ports/opencsg/portfile.cmake b/ports/opencsg/portfile.cmake index f47996af5..939b873cb 100644 --- a/ports/opencsg/portfile.cmake +++ b/ports/opencsg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/openigtlink/portfile.cmake b/ports/openigtlink/portfile.cmake index a5a240fae..532d8661e 100644 --- a/ports/openigtlink/portfile.cmake +++ b/ports/openigtlink/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openigtlink/OpenIGTLink
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake index 92071e537..0864fda61 100644 --- a/ports/openni2/portfile.cmake +++ b/ports/openni2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "Error: UWP builds are currently not supported.") endif() diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 7ccf34dcf..817b2a5a1 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP build is not supported.")
endif()
@@ -16,7 +14,7 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opentracing/opentracing-cpp
- REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0 + REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0
SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e
)
diff --git a/ports/openvpn3/portfile.cmake b/ports/openvpn3/portfile.cmake index fefa2cb52..e638f1a42 100644 --- a/ports/openvpn3/portfile.cmake +++ b/ports/openvpn3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( diff --git a/ports/optional-bare/portfile.cmake b/ports/optional-bare/portfile.cmake index 6474d81c7..6219df627 100644 --- a/ports/optional-bare/portfile.cmake +++ b/ports/optional-bare/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/optional-bare
diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake index 1716c89ad..1817a54a9 100644 --- a/ports/optional-lite/portfile.cmake +++ b/ports/optional-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/optional-lite
diff --git a/ports/opusfile/portfile.cmake b/ports/opusfile/portfile.cmake index 2fd3d939d..ed687167c 100644 --- a/ports/opusfile/portfile.cmake +++ b/ports/opusfile/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 8044d3ee9..7f41c3847 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -30,6 +30,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl)
file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME orocos-kdl)
diff --git a/ports/osi/portfile.cmake b/ports/osi/portfile.cmake index 399381d70..ea585b115 100644 --- a/ports/osi/portfile.cmake +++ b/ports/osi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/p-ranav-csv/portfile.cmake b/ports/p-ranav-csv/portfile.cmake index 123842478..fcbaeee74 100644 --- a/ports/p-ranav-csv/portfile.cmake +++ b/ports/p-ranav-csv/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO p-ranav/csv
diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index f3eee992f..a7558a877 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(ADDITIONAL_OPTIONS -DSHARED=OFF) diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake index 76050f353..887be6ec8 100644 --- a/ports/parson/portfile.cmake +++ b/ports/parson/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") message("parson only supports static linkage") set(VCPKG_LIBRARY_LINKAGE "static") diff --git a/ports/pcg/portfile.cmake b/ports/pcg/portfile.cmake index 75a4c9040..738a31efa 100644 --- a/ports/pcg/portfile.cmake +++ b/ports/pcg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO imneme/pcg-cpp diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index bdfdd387e..3e1b8c1a9 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/ports/pdqsort/portfile.cmake b/ports/pdqsort/portfile.cmake index a9c6a9211..9e4c3e798 100644 --- a/ports/pdqsort/portfile.cmake +++ b/ports/pdqsort/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO orlp/pdqsort diff --git a/ports/pfultz2-linq/portfile.cmake b/ports/pfultz2-linq/portfile.cmake index de0980b6a..d3eeff7c4 100644 --- a/ports/pfultz2-linq/portfile.cmake +++ b/ports/pfultz2-linq/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pfultz2/Linq
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME linq)
diff --git a/ports/phnt/portfile.cmake b/ports/phnt/portfile.cmake index f381d5a9f..a75aab70d 100644 --- a/ports/phnt/portfile.cmake +++ b/ports/phnt/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO processhacker/phnt diff --git a/ports/picojson/portfile.cmake b/ports/picojson/portfile.cmake index 1919e6130..53bd084a0 100644 --- a/ports/picojson/portfile.cmake +++ b/ports/picojson/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kazuho/picojson diff --git a/ports/picosha2/portfile.cmake b/ports/picosha2/portfile.cmake index 7a93b2d8f..80db0c35f 100644 --- a/ports/picosha2/portfile.cmake +++ b/ports/picosha2/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO okdshin/PicoSHA2 diff --git a/ports/piex/portfile.cmake b/ports/piex/portfile.cmake index a05fe837e..485210da0 100644 --- a/ports/piex/portfile.cmake +++ b/ports/piex/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index d0400dcdf..ea7deba19 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") message(FATAL_ERROR "${PORT} currently only supports Linux platform.") endif() diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 6e4f2f626..25bbd2d04 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(PIXMAN_VERSION 0.38.4) @@ -43,5 +41,3 @@ file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixma file(RENAME ${CURRENT_PACKAGES_DIR}/share/pixman/COPYING ${CURRENT_PACKAGES_DIR}/share/pixman/copyright) vcpkg_copy_pdbs() - -vcpkg_test_cmake(PACKAGE_NAME unofficial-pixman) diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index 564fe1b47..6b2344db6 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) diff --git a/ports/plf-colony/portfile.cmake b/ports/plf-colony/portfile.cmake index 85c9409ee..fc1d7669a 100644 --- a/ports/plf-colony/portfile.cmake +++ b/ports/plf-colony/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_colony diff --git a/ports/plf-list/portfile.cmake b/ports/plf-list/portfile.cmake index f9efd1e61..97fd06280 100644 --- a/ports/plf-list/portfile.cmake +++ b/ports/plf-list/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_list diff --git a/ports/plf-nanotimer/portfile.cmake b/ports/plf-nanotimer/portfile.cmake index 4c25a2c73..c02495d73 100644 --- a/ports/plf-nanotimer/portfile.cmake +++ b/ports/plf-nanotimer/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_nanotimer diff --git a/ports/plf-stack/portfile.cmake b/ports/plf-stack/portfile.cmake index 11a9fb068..370ea578c 100644 --- a/ports/plf-stack/portfile.cmake +++ b/ports/plf-stack/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_stack diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake index 73fe786ac..1991b2f6b 100644 --- a/ports/plib/portfile.cmake +++ b/ports/plib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/plog/portfile.cmake b/ports/plog/portfile.cmake index 1d5f36e58..a4b769dc3 100644 --- a/ports/plog/portfile.cmake +++ b/ports/plog/portfile.cmake @@ -1,6 +1,4 @@ # Header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SergiusTheBest/plog
diff --git a/ports/plustache/portfile.cmake b/ports/plustache/portfile.cmake index 237e1b26f..def92fc15 100644 --- a/ports/plustache/portfile.cmake +++ b/ports/plustache/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/pngwriter/portfile.cmake b/ports/pngwriter/portfile.cmake index 06793058a..610580b22 100644 --- a/ports/pngwriter/portfile.cmake +++ b/ports/pngwriter/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/portable-snippets/portfile.cmake b/ports/portable-snippets/portfile.cmake index c84aca26b..197008c3e 100644 --- a/ports/portable-snippets/portfile.cmake +++ b/ports/portable-snippets/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -27,6 +25,3 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share # Handle copyright configure_file(${SOURCE_PATH}/COPYING.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT}) diff --git a/ports/pprint/portfile.cmake b/ports/pprint/portfile.cmake index 3b360e683..609117815 100644 --- a/ports/pprint/portfile.cmake +++ b/ports/pprint/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO p-ranav/pprint
diff --git a/ports/pqp/portfile.cmake b/ports/pqp/portfile.cmake index 56b36a0ff..ac6ab13b1 100644 --- a/ports/pqp/portfile.cmake +++ b/ports/pqp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index 6573a01d7..fa8d1c350 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/pystring/portfile.cmake b/ports/pystring/portfile.cmake index 8384bc018..24a038aa5 100644 --- a/ports/pystring/portfile.cmake +++ b/ports/pystring/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index ea11b33b5..212d5a1df 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -12,8 +12,6 @@ set(PYTHON_VERSION_MINOR 7) set(PYTHON_VERSION_PATCH 15) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) -include(vcpkg_common_functions) - set(_PYTHON_PATCHES "") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) list(APPEND _PYTHON_PATCHES diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake index ba153e79a..b180d8bd7 100644 --- a/ports/qcustomplot/portfile.cmake +++ b/ports/qcustomplot/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
set(QCP_VERSION 2.0.1)
vcpkg_download_distfile(ARCHIVE
diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 3a3377696..e8a911462 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 7894bbba7..9479252ec 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lballabio/QuantLib
diff --git a/ports/quickfast/portfile.cmake b/ports/quickfast/portfile.cmake index 7f3f6b8f4..bf4878bd3 100644 --- a/ports/quickfast/portfile.cmake +++ b/ports/quickfast/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO objectcomputing/quickfast diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake index 4e25b0289..4da14ec19 100644 --- a/ports/quirc/portfile.cmake +++ b/ports/quirc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/rabit/portfile.cmake b/ports/rabit/portfile.cmake index 80ad0554c..b8846b22e 100644 --- a/ports/rabit/portfile.cmake +++ b/ports/rabit/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} does not currently support UWP.")
endif()
@@ -20,7 +18,7 @@ vcpkg_configure_cmake( PREFER_NINJA
OPTIONS
-DRABIT_BUILD_TESTS=OFF
- -DRABIT_BUILD_MPI=OFF + -DRABIT_BUILD_MPI=OFF
)
vcpkg_install_cmake()
@@ -33,4 +31,4 @@ vcpkg_copy_pdbs() # Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/ragel/portfile.cmake b/ports/ragel/portfile.cmake index 037f34289..69c47a1cd 100644 --- a/ports/ragel/portfile.cmake +++ b/ports/ragel/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.colm.net/files/ragel/ragel-6.10.tar.gz" FILENAME "ragel-6.10.tar.gz" diff --git a/ports/rang/portfile.cmake b/ports/rang/portfile.cmake index 4c332a82e..f2eead874 100644 --- a/ports/rang/portfile.cmake +++ b/ports/rang/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO agauniyal/rang
diff --git a/ports/range-v3-vs2015/portfile.cmake b/ports/range-v3-vs2015/portfile.cmake index bc7153a53..004711ab2 100644 --- a/ports/range-v3-vs2015/portfile.cmake +++ b/ports/range-v3-vs2015/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/Range-V3-VS2015 diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 09917bb0c..d20f5fd79 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson diff --git a/ports/rapidxml-ns/portfile.cmake b/ports/rapidxml-ns/portfile.cmake index d51fa0312..e2d9a0cc9 100644 --- a/ports/rapidxml-ns/portfile.cmake +++ b/ports/rapidxml-ns/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svgpp/rapidxml_ns diff --git a/ports/readerwriterqueue/portfile.cmake b/ports/readerwriterqueue/portfile.cmake index 07a99aa89..bf61bdb32 100644 --- a/ports/readerwriterqueue/portfile.cmake +++ b/ports/readerwriterqueue/portfile.cmake @@ -1,5 +1,4 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/readerwriterqueue diff --git a/ports/readline-win32/portfile.cmake b/ports/readline-win32/portfile.cmake index b7c60e073..c6fa9435f 100644 --- a/ports/readline-win32/portfile.cmake +++ b/ports/readline-win32/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lltcggie/readline
diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index a84d06e3c..3b6038e41 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/restbed/portfile.cmake b/ports/restbed/portfile.cmake index 5c653bd4f..5cfa601f3 100644 --- a/ports/restbed/portfile.cmake +++ b/ports/restbed/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(USE_OPENSSL OFF)
diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index 91ed83961..096634bb0 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -2,7 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "UWP builds not supported") endif() -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash diff --git a/ports/riffcpp/portfile.cmake b/ports/riffcpp/portfile.cmake index 057fe2092..9460bd3f7 100644 --- a/ports/riffcpp/portfile.cmake +++ b/ports/riffcpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libdmusic/riffcpp @@ -23,4 +21,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/riffcpp) file(RENAME ${CURRENT_PACKAGES_DIR}/share/riffcpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/riffcpp/copyright) -vcpkg_test_cmake(PACKAGE_NAME riffcpp)
\ No newline at end of file diff --git a/ports/ring-span-lite/portfile.cmake b/ports/ring-span-lite/portfile.cmake index b9b993054..a96a8af17 100644 --- a/ports/ring-span-lite/portfile.cmake +++ b/ports/ring-span-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/ring-span-lite
diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake index 937fd0751..820e6f5db 100644 --- a/ports/roaring/portfile.cmake +++ b/ports/roaring/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if (TARGET_TRIPLET MATCHES "^x86")
message(WARNING "The CRoaring authors recommend users of this lib against using a 32-bit build.")
endif ()
@@ -33,6 +31,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index 818b39d92..1cba8bb47 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index b7583c0c4..3c56fd94b 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib diff --git a/ports/rxqt/portfile.cmake b/ports/rxqt/portfile.cmake index f84bf7c7c..34799c346 100644 --- a/ports/rxqt/portfile.cmake +++ b/ports/rxqt/portfile.cmake @@ -1,7 +1,5 @@ #header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tetsurom/rxqt
diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake index 0e68fccc1..0e5240b0b 100644 --- a/ports/sais/portfile.cmake +++ b/ports/sais/portfile.cmake @@ -1,6 +1,4 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip"
FILENAME "sais-2.4.1.zip"
diff --git a/ports/sajson/portfile.cmake b/ports/sajson/portfile.cmake index 662ab01f7..4fd0cac33 100644 --- a/ports/sajson/portfile.cmake +++ b/ports/sajson/portfile.cmake @@ -1,7 +1,5 @@ # Header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chadaustin/sajson diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 4c9d7f6d3..84e76332d 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index ae7777aa1..40e3a7123 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -30,5 +30,3 @@ file(REMOVE_RECURSE file(INSTALL ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright)
-
-vcpkg_test_cmake(PACKAGE_NAME scn)
diff --git a/ports/scylla-wrapper/portfile.cmake b/ports/scylla-wrapper/portfile.cmake index 69e28b649..03dfbb6f9 100644 --- a/ports/scylla-wrapper/portfile.cmake +++ b/ports/scylla-wrapper/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
# scylla_wrapper_dll supplies a DllMain
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
diff --git a/ports/sdl1-net/portfile.cmake b/ports/sdl1-net/portfile.cmake index 0c1d0e130..e88d99d35 100644 --- a/ports/sdl1-net/portfile.cmake +++ b/ports/sdl1-net/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" FILENAME "SDL_net-1.2.8.tar.gz" diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index ea4744148..84e4e8268 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(SDL2_IMAGE_VERSION "2.0.5") vcpkg_download_distfile(ARCHIVE diff --git a/ports/sdl2-net/portfile.cmake b/ports/sdl2-net/portfile.cmake index 70cea05c8..9534a9aa4 100644 --- a/ports/sdl2-net/portfile.cmake +++ b/ports/sdl2-net/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz" FILENAME "SDL2_net-2.0.1.tar.gz" diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index eb623e13e..24f75241f 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(VERSION 2.0.15) vcpkg_download_distfile(ARCHIVE diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index 2623acac1..138d7181e 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT)
endif()
diff --git a/ports/septag-sx/portfile.cmake b/ports/septag-sx/portfile.cmake index 4fb87a250..0d7686bcf 100644 --- a/ports/septag-sx/portfile.cmake +++ b/ports/septag-sx/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(TARGET_TRIPLET MATCHES "(uwp|arm)") message(FATAL_ERROR "septag-sx doesn't support ${TARGET_TRIPLET} currently.") endif() @@ -39,6 +37,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME sx) diff --git a/ports/seqan/portfile.cmake b/ports/seqan/portfile.cmake index 1fef42f0a..b343b82c4 100644 --- a/ports/seqan/portfile.cmake +++ b/ports/seqan/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_download_distfile(ARCHIVE
URLS "http://packages.seqan.de/seqan-library/seqan-library-2.4.0.zip"
FILENAME "seqan-library-2.4.0.zip"
diff --git a/ports/sf2cute/portfile.cmake b/ports/sf2cute/portfile.cmake index e46222396..d82c0f94f 100644 --- a/ports/sf2cute/portfile.cmake +++ b/ports/sf2cute/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gocha/sf2cute
@@ -36,6 +34,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sf if(BUILD_EXAMPLE)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/sf2cute)
endif()
-
-# Post-build test for cmake libraries
-vcpkg_test_cmake(PACKAGE_NAME sf2cute)
diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake index 3e1fada8e..b2c678765 100644 --- a/ports/sfgui/portfile.cmake +++ b/ports/sfgui/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO TankOs/SFGUI diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 297842296..b76775b76 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/shaderc diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake index ea6969d04..0e603e8de 100644 --- a/ports/shiva-sfml/portfile.cmake +++ b/ports/shiva-sfml/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Milerius/shiva
diff --git a/ports/signalrclient/portfile.cmake b/ports/signalrclient/portfile.cmake index 39f1992b8..f66b3a2fc 100644 --- a/ports/signalrclient/portfile.cmake +++ b/ports/signalrclient/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SignalR/SignalR-Client-Cpp diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index e79594ace..bfc787cc3 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nemequ/simde
diff --git a/ports/smpeg2/portfile.cmake b/ports/smpeg2/portfile.cmake index a7c6e9b07..acba22237 100644 --- a/ports/smpeg2/portfile.cmake +++ b/ports/smpeg2/portfile.cmake @@ -1,6 +1,4 @@ -include(vcpkg_common_functions)
-
set(VERSION 2.0.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://www.libsdl.org/projects/smpeg/release/smpeg2-${VERSION}.tar.gz"
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 0a9ea941d..75dd13302 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/snappy diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake index 090756199..279fa6e4a 100644 --- a/ports/snowhouse/portfile.cmake +++ b/ports/snowhouse/portfile.cmake @@ -1,9 +1,7 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO banditcpp/snowhouse
- REF 3faaff8d836c726aa2001adf3d2253d3b368b06b # v5.0.0 + REF 3faaff8d836c726aa2001adf3d2253d3b368b06b # v5.0.0
SHA512 d1fdd01b376ea26a4c9312df9f952f5b543d1f9d4a8049b7302961d3403200659cb448e5c032f9f05f4f0eeed7434d94beaf108f80cd155c37fe63eaf14651c2
HEAD_REF master
)
diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index c7d33d23d..6f2041ae2 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/soil/portfile.cmake b/ports/soil/portfile.cmake index f97be5259..1346722e1 100644 --- a/ports/soil/portfile.cmake +++ b/ports/soil/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "http://www.lonesock.net/files/soil.zip" FILENAME "soil-2008.07.07.zip" diff --git a/ports/sokol/portfile.cmake b/ports/sokol/portfile.cmake index 92eee036d..9785eecca 100644 --- a/ports/sokol/portfile.cmake +++ b/ports/sokol/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO floooh/sokol
diff --git a/ports/solid3/portfile.cmake b/ports/solid3/portfile.cmake index dc61a5654..8cca23ada 100644 --- a/ports/solid3/portfile.cmake +++ b/ports/solid3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dtecta/solid3 diff --git a/ports/sophus/portfile.cmake b/ports/sophus/portfile.cmake index c7480b904..ee7a6d576 100644 --- a/ports/sophus/portfile.cmake +++ b/ports/sophus/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strasdat/Sophus diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake index 861af9db3..2897f7367 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
diff --git a/ports/sparsehash/portfile.cmake b/ports/sparsehash/portfile.cmake index 1dcccda82..a999e8841 100644 --- a/ports/sparsehash/portfile.cmake +++ b/ports/sparsehash/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sparsehash/sparsehash diff --git a/ports/sparsepp/portfile.cmake b/ports/sparsepp/portfile.cmake index a98e1a6e6..c326c214c 100644 --- a/ports/sparsepp/portfile.cmake +++ b/ports/sparsepp/portfile.cmake @@ -1,6 +1,4 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index 0a120e4e5..f8a8d46e1 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -1,5 +1,3 @@ -INCLUDE(vcpkg_common_functions) - IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") ENDIF () @@ -43,5 +41,3 @@ FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake index 3ed53c258..df7ee6771 100644 --- a/ports/spdk-ipsec/portfile.cmake +++ b/ports/spdk-ipsec/portfile.cmake @@ -54,5 +54,3 @@ FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR} FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/spdk-isal/portfile.cmake b/ports/spdk-isal/portfile.cmake index 530d8da83..31461d9ac 100644 --- a/ports/spdk-isal/portfile.cmake +++ b/ports/spdk-isal/portfile.cmake @@ -1,5 +1,3 @@ -INCLUDE(vcpkg_common_functions) - IF (NOT VCPKG_CMAKE_SYSTEM_NAME) SET(EXEC_ENV "Windows") ELSE () @@ -48,5 +46,3 @@ FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR} FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/spdk/portfile.cmake b/ports/spdk/portfile.cmake index cc5e82989..38c0326fe 100644 --- a/ports/spdk/portfile.cmake +++ b/ports/spdk/portfile.cmake @@ -1,5 +1,3 @@ -INCLUDE(vcpkg_common_functions) - IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") MESSAGE(FATAL_ERROR "Intel spdk currently only supports Linux/BSD platforms") ENDIF () @@ -38,5 +36,3 @@ FILE(INSTALL ${SOURCE_PATH}/include/spdk/pci_ids.h DESTINATION ${CURRENT_PACKAGE FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -VCPKG_TEST_CMAKE(PACKAGE_NAME ${PORT}) diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake index 3942b4be5..bad7e4dbb 100644 --- a/ports/spectra/portfile.cmake +++ b/ports/spectra/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO yixuan/spectra
diff --git a/ports/spirit-po/portfile.cmake b/ports/spirit-po/portfile.cmake index d961ce256..36b9564bb 100644 --- a/ports/spirit-po/portfile.cmake +++ b/ports/spirit-po/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/spirit-po diff --git a/ports/sprout/portfile.cmake b/ports/sprout/portfile.cmake index 7be1c1985..5cfb923b3 100644 --- a/ports/sprout/portfile.cmake +++ b/ports/sprout/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO bolero-MURAKAMI/Sprout
diff --git a/ports/sqlite-modern-cpp/portfile.cmake b/ports/sqlite-modern-cpp/portfile.cmake index 35b364dde..5d4cad040 100644 --- a/ports/sqlite-modern-cpp/portfile.cmake +++ b/ports/sqlite-modern-cpp/portfile.cmake @@ -1,6 +1,4 @@ # header only
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SqliteModernCpp/sqlite_modern_cpp
diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake index 47a4a7ff7..1663ca73a 100644 --- a/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/status-value-lite/portfile.cmake b/ports/status-value-lite/portfile.cmake index d3b1dc899..3e935cd5c 100644 --- a/ports/status-value-lite/portfile.cmake +++ b/ports/status-value-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/status-value-lite diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake index d0e9e36a4..b494d5606 100644 --- a/ports/stormlib/portfile.cmake +++ b/ports/stormlib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ladislav-zezula/StormLib
diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake index 98108b9b1..cc258b561 100644 --- a/ports/strict-variant/portfile.cmake +++ b/ports/strict-variant/portfile.cmake @@ -1,6 +1,4 @@ # header-only -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/strict-variant diff --git a/ports/string-view-lite/portfile.cmake b/ports/string-view-lite/portfile.cmake index 068b16c08..95e18d68a 100644 --- a/ports/string-view-lite/portfile.cmake +++ b/ports/string-view-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/string-view-lite
diff --git a/ports/strtk/portfile.cmake b/ports/strtk/portfile.cmake index 8375ef74e..770f183c0 100644 --- a/ports/strtk/portfile.cmake +++ b/ports/strtk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/strtk diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index 01d072d09..a45fce791 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index a76728659..d5b52cac3 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(ARCHIVE_NAME "sundials-3.1.1") vcpkg_download_distfile(ARCHIVE diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake index b7fb57b1f..e6439eb5c 100644 --- a/ports/systemc/portfile.cmake +++ b/ports/systemc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(SYSTEMC_VERSION 2.3.3)
diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index ab669cebc..f62e72bd7 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz" FILENAME "szip-2.1.1.tar.gz" diff --git a/ports/tacopie/portfile.cmake b/ports/tacopie/portfile.cmake index 25ba4cf16..4cf2d73dc 100644 --- a/ports/tacopie/portfile.cmake +++ b/ports/tacopie/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index 4ccb6a9fe..c6e573526 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib diff --git a/ports/taocpp-json/portfile.cmake b/ports/taocpp-json/portfile.cmake index bf3f8c72a..653a3d201 100644 --- a/ports/taocpp-json/portfile.cmake +++ b/ports/taocpp-json/portfile.cmake @@ -1,11 +1,9 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taocpp/json
- REF f357d7269b7503eed21d0c3b98b9075c28a98f56 # accessed on 2020-09-14 + REF f357d7269b7503eed21d0c3b98b9075c28a98f56 # accessed on 2020-09-14
SHA512 4a4be970779ed0c6044c7ad40918ad6b3908ca10dbfb3738cbebb62154d437ad13ca27947119a6b1a6c8d92b22a9282477c73ddc5721ca30b8b355b77d7ce729
HEAD_REF master
)
@@ -33,6 +31,3 @@ configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copy file(COPY ${SOURCE_PATH}/LICENSE.double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/LICENSE.itoa DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/LICENSE.ryu DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/tap-windows6/portfile.cmake b/ports/tap-windows6/portfile.cmake index 4e2725d1e..dcd27824e 100644 --- a/ports/tap-windows6/portfile.cmake +++ b/ports/tap-windows6/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenVPN/tap-windows6 diff --git a/ports/tgc/portfile.cmake b/ports/tgc/portfile.cmake index 4efe63c21..317146191 100644 --- a/ports/tgc/portfile.cmake +++ b/ports/tgc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -26,5 +24,3 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/think-cell-range/portfile.cmake b/ports/think-cell-range/portfile.cmake index d1acc2c51..2599e517d 100644 --- a/ports/think-cell-range/portfile.cmake +++ b/ports/think-cell-range/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO think-cell/range diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake index 19f65f806..4a6a7a5dc 100644 --- a/ports/thor/portfile.cmake +++ b/ports/thor/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH REPO Bromeon/Thor diff --git a/ports/tiny-aes-c/portfile.cmake b/ports/tiny-aes-c/portfile.cmake index e1bb5cb31..80439c1e0 100644 --- a/ports/tiny-aes-c/portfile.cmake +++ b/ports/tiny-aes-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/unlicense.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/tiny-bignum-c/portfile.cmake b/ports/tiny-bignum-c/portfile.cmake index 732271241..81bdd55a6 100644 --- a/ports/tiny-bignum-c/portfile.cmake +++ b/ports/tiny-bignum-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/tiny-dnn/portfile.cmake b/ports/tiny-dnn/portfile.cmake index 500a42906..77d7fe4e4 100644 --- a/ports/tiny-dnn/portfile.cmake +++ b/ports/tiny-dnn/portfile.cmake @@ -1,5 +1,4 @@ #header-only library -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tiny-dnn/tiny-dnn diff --git a/ports/tiny-process-library/portfile.cmake b/ports/tiny-process-library/portfile.cmake index bcab0c4a4..8be4a550a 100644 --- a/ports/tiny-process-library/portfile.cmake +++ b/ports/tiny-process-library/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
@@ -34,6 +32,3 @@ file(REMOVE_RECURSE # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/tiny-regex-c/portfile.cmake b/ports/tiny-regex-c/portfile.cmake index 2e21fb433..4a5564cf6 100644 --- a/ports/tiny-regex-c/portfile.cmake +++ b/ports/tiny-regex-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -25,6 +23,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT})
diff --git a/ports/tinycthread/portfile.cmake b/ports/tinycthread/portfile.cmake index e521ffb00..2d6c8b18b 100644 --- a/ports/tinycthread/portfile.cmake +++ b/ports/tinycthread/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/tinydir/portfile.cmake b/ports/tinydir/portfile.cmake index 223b7d763..b5e5647bc 100644 --- a/ports/tinydir/portfile.cmake +++ b/ports/tinydir/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cxong/tinydir diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index b1940ad94..12e6f5cb9 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF diff --git a/ports/tinynpy/portfile.cmake b/ports/tinynpy/portfile.cmake index 69e31edd7..283a91b10 100644 --- a/ports/tinynpy/portfile.cmake +++ b/ports/tinynpy/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyNPY diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake index 87b606946..86f76edb0 100644 --- a/ports/tinyobjloader/portfile.cmake +++ b/ports/tinyobjloader/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/tinyspline/portfile.cmake b/ports/tinyspline/portfile.cmake index 5d202b7ca..a62d2f42c 100644 --- a/ports/tinyspline/portfile.cmake +++ b/ports/tinyspline/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO msteinbeck/tinyspline
diff --git a/ports/tinythread/portfile.cmake b/ports/tinythread/portfile.cmake index 94a180176..7b29ab146 100644 --- a/ports/tinythread/portfile.cmake +++ b/ports/tinythread/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/tinytoml/portfile.cmake b/ports/tinytoml/portfile.cmake index 9d7275cf2..6f3af53f4 100644 --- a/ports/tinytoml/portfile.cmake +++ b/ports/tinytoml/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mayah/tinytoml diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake index 26b5fb95d..2dad4fbaa 100644 --- a/ports/tinyutf8/portfile.cmake +++ b/ports/tinyutf8/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/tl-expected/portfile.cmake b/ports/tl-expected/portfile.cmake index 80ec7e89b..1c99d0741 100644 --- a/ports/tl-expected/portfile.cmake +++ b/ports/tl-expected/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO TartanLlama/expected diff --git a/ports/tl-function-ref/portfile.cmake b/ports/tl-function-ref/portfile.cmake index 07df6a048..ea5274796 100644 --- a/ports/tl-function-ref/portfile.cmake +++ b/ports/tl-function-ref/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO TartanLlama/function_ref diff --git a/ports/tl-optional/portfile.cmake b/ports/tl-optional/portfile.cmake index 3c3085cc9..bbd80307d 100644 --- a/ports/tl-optional/portfile.cmake +++ b/ports/tl-optional/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO TartanLlama/optional
diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake index 14f1234f4..6c0dda980 100644 --- a/ports/tmxlite/portfile.cmake +++ b/ports/tmxlite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fallahn/tmxlite
diff --git a/ports/torch-th/portfile.cmake b/ports/torch-th/portfile.cmake index 0d7224600..7fd23944b 100644 --- a/ports/torch-th/portfile.cmake +++ b/ports/torch-th/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( diff --git a/ports/tre/portfile.cmake b/ports/tre/portfile.cmake index 0cf993082..f468138de 100644 --- a/ports/tre/portfile.cmake +++ b/ports/tre/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO laurikari/tre diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index 1fe3190f5..130faddfa 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rollbear/trompeloeil diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake index 83702102f..b74e41409 100644 --- a/ports/tsl-hopscotch-map/portfile.cmake +++ b/ports/tsl-hopscotch-map/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/hopscotch-map diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake index 02ed3f63a..4605d72eb 100644 --- a/ports/tsl-ordered-map/portfile.cmake +++ b/ports/tsl-ordered-map/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/ordered-map diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake index 55c4ab8bb..9feba6cc3 100644 --- a/ports/tsl-sparse-map/portfile.cmake +++ b/ports/tsl-sparse-map/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/sparse-map diff --git a/ports/type-lite/portfile.cmake b/ports/type-lite/portfile.cmake index 27cec8aab..421fbf51e 100644 --- a/ports/type-lite/portfile.cmake +++ b/ports/type-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/type-lite diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 7e799c589..aee7b65b9 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "WindowsStore not supported") endif() diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake index 597444d3b..e54daf77d 100644 --- a/ports/unittest-cpp/portfile.cmake +++ b/ports/unittest-cpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake index 46657946a..239316f07 100644 --- a/ports/unrar/portfile.cmake +++ b/ports/unrar/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) set(UNRAR_VERSION "5.8.1") set(UNRAR_SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612) set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz) diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 83a6ce8c0..36e24ce9e 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser @@ -59,6 +57,3 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ur # Remove duplicate info file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake index 1dd97f381..b4629defa 100644 --- a/ports/utf8proc/portfile.cmake +++ b/ports/utf8proc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc diff --git a/ports/utfz/portfile.cmake b/ports/utfz/portfile.cmake index 27b5d17c4..d81f1aeb1 100644 --- a/ports/utfz/portfile.cmake +++ b/ports/utfz/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IMQS/utfz diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index df45f82c2..a6eb493e7 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake index aeb739983..ec32fa100 100644 --- a/ports/valijson/portfile.cmake +++ b/ports/valijson/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tristanpenman/valijson diff --git a/ports/value-ptr-lite/portfile.cmake b/ports/value-ptr-lite/portfile.cmake index a0e429b33..f14895468 100644 --- a/ports/value-ptr-lite/portfile.cmake +++ b/ports/value-ptr-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/value-ptr-lite diff --git a/ports/variant-lite/portfile.cmake b/ports/variant-lite/portfile.cmake index 764fd74ef..0bb4fc48d 100644 --- a/ports/variant-lite/portfile.cmake +++ b/ports/variant-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/variant-lite
diff --git a/ports/vcglib/portfile.cmake b/ports/vcglib/portfile.cmake index 5389a69fb..1af58bdcb 100644 --- a/ports/vcglib/portfile.cmake +++ b/ports/vcglib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cnr-isti-vclab/vcglib diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake index 8a87471c5..a797803ef 100644 --- a/ports/visit-struct/portfile.cmake +++ b/ports/visit-struct/portfile.cmake @@ -1,6 +1,4 @@ #header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/visit_struct diff --git a/ports/vlpp/portfile.cmake b/ports/vlpp/portfile.cmake index bc5f4410d..96a04e6cb 100644 --- a/ports/vlpp/portfile.cmake +++ b/ports/vlpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index 4171293d0..e2083887d 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - # volk is not prepared to be a DLL. vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/vulkan-hpp/portfile.cmake b/ports/vulkan-hpp/portfile.cmake index 809b8149c..ba249b692 100644 --- a/ports/vulkan-hpp/portfile.cmake +++ b/ports/vulkan-hpp/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Hpp diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index 344418139..47b009592 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index 5035acd35..7493614e1 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -1,8 +1,6 @@ # Due to the complexity involved, this package doesn't install the Vulkan SDK. # It instead verifies that Vulkan is installed. # Other packages can depend on this package to declare a dependency on Vulkan. -include(vcpkg_common_functions) - message(STATUS "Querying VULKAN_SDK Enviroment variable") file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR) set(VULKAN_INCLUDE "${VULKAN_DIR}/include/vulkan/") diff --git a/ports/wampcc/portfile.cmake b/ports/wampcc/portfile.cmake index b9e4e1d60..8b31ecb46 100644 --- a/ports/wampcc/portfile.cmake +++ b/ports/wampcc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if (VCPKG_TARGET_IS_WINDOWS)
message("Shared build is broken under Windows. See https://github.com/darrenjs/wampcc/issues/57")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 372395155..9082aa041 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
- REF 4bf3896ad5e938a01ba20efaf1ea59317d846fb2 # v2020.10.19.00 + REF 4bf3896ad5e938a01ba20efaf1ea59317d846fb2 # v2020.10.19.00
SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa
HEAD_REF master
PATCHES
diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index dd23d362c..a030e1ec5 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -44,6 +44,3 @@ if(WIN32 AND (NOT MINGW)) endif()
vcpkg_fixup_pkgconfig()
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME wavpack)
diff --git a/ports/wepoll/portfile.cmake b/ports/wepoll/portfile.cmake index 53f1ca1a4..5028da2ad 100644 --- a/ports/wepoll/portfile.cmake +++ b/ports/wepoll/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(NOT VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "${PORT} only supports Windows.")
endif()
diff --git a/ports/wg21-sg14/portfile.cmake b/ports/wg21-sg14/portfile.cmake index d72be282a..4fdf80df5 100644 --- a/ports/wg21-sg14/portfile.cmake +++ b/ports/wg21-sg14/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO WG21-SG14/SG14
diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index b6bbe80a1..6e18ba110 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -1,6 +1,4 @@ #header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/wil
diff --git a/ports/wildmidi/portfile.cmake b/ports/wildmidi/portfile.cmake index ac872c1a0..2280c4aca 100644 --- a/ports/wildmidi/portfile.cmake +++ b/ports/wildmidi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Mindwerks/wildmidi diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake index c7f2f8952..c99d50212 100644 --- a/ports/wintoast/portfile.cmake +++ b/ports/wintoast/portfile.cmake @@ -2,8 +2,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/woff2/portfile.cmake b/ports/woff2/portfile.cmake index 41efbba0a..9ec3e55cd 100644 --- a/ports/woff2/portfile.cmake +++ b/ports/woff2/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(
ONLY_STATIC_LIBRARY
)
diff --git a/ports/wordnet/portfile.cmake b/ports/wordnet/portfile.cmake index 1f3193187..59ca68051 100644 --- a/ports/wordnet/portfile.cmake +++ b/ports/wordnet/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(VERSION 3.0)
diff --git a/ports/wxchartdir/portfile.cmake b/ports/wxchartdir/portfile.cmake index 51506f112..0e2052ec2 100644 --- a/ports/wxchartdir/portfile.cmake +++ b/ports/wxchartdir/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index 78a8b4295..ccd3007e8 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
message(FATAL_ERROR "the x-plane SDK cannot be built for the x86 architecture")
endif()
diff --git a/ports/xorstr/portfile.cmake b/ports/xorstr/portfile.cmake index 5fa39e94a..0fbe6f2db 100644 --- a/ports/xorstr/portfile.cmake +++ b/ports/xorstr/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/xorstr diff --git a/ports/xproperty/portfile.cmake b/ports/xproperty/portfile.cmake index 8a415f2a1..364f95c50 100644 --- a/ports/xproperty/portfile.cmake +++ b/ports/xproperty/portfile.cmake @@ -1,7 +1,5 @@ # header-only library
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO QuantStack/xproperty
diff --git a/ports/yajl/portfile.cmake b/ports/yajl/portfile.cmake index 92742e0a7..c01987dee 100644 --- a/ports/yajl/portfile.cmake +++ b/ports/yajl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lloyd/yajl diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 5dfe2a51c..75090b371 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if (NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "${PORT} only supports windows") elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm") diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake index 76a54ee13..e0b7a916b 100644 --- a/ports/yato/portfile.cmake +++ b/ports/yato/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO alexey_gruzdev/yato
diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index a0b937218..7b07a6399 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/z85/portfile.cmake b/ports/z85/portfile.cmake index 578b46ba3..b3316ee9a 100644 --- a/ports/z85/portfile.cmake +++ b/ports/z85/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artemkin/z85 diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 657b15089..de448216e 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq @@ -72,6 +70,3 @@ endif() file(RENAME ${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt ${CURRENT_PACKAGES_DIR}/share/zeromq/copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/zmq) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ZeroMQ) diff --git a/ports/zfp/portfile.cmake b/ports/zfp/portfile.cmake index d189762b7..64d1f7e3c 100644 --- a/ports/zfp/portfile.cmake +++ b/ports/zfp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LLNL/zfp
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 6277d5b0a..0d63291a2 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -52,5 +52,3 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -# vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE) diff --git a/ports/zookeeper/portfile.cmake b/ports/zookeeper/portfile.cmake index 8fee1483c..1dfcfb376 100644 --- a/ports/zookeeper/portfile.cmake +++ b/ports/zookeeper/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/zserge-webview/portfile.cmake b/ports/zserge-webview/portfile.cmake index 7f0603d88..47b3e0c58 100644 --- a/ports/zserge-webview/portfile.cmake +++ b/ports/zserge-webview/portfile.cmake @@ -1,7 +1,5 @@ # header-only library -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zserge/webview diff --git a/ports/zstr/portfile.cmake b/ports/zstr/portfile.cmake index 61244eb60..a2085ef94 100644 --- a/ports/zstr/portfile.cmake +++ b/ports/zstr/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mateidavid/zstr diff --git a/ports/zyre/portfile.cmake b/ports/zyre/portfile.cmake index de44b4b03..e2a3f9878 100644 --- a/ports/zyre/portfile.cmake +++ b/ports/zyre/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/zyre @@ -64,6 +62,3 @@ endif() # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index a4ea18532..8b956a553 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gdraheim/zziplib diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1 index 50e7f6afd..3b6fe5aaa 100644 --- a/scripts/azure-pipelines/end-to-end-tests.ps1 +++ b/scripts/azure-pipelines/end-to-end-tests.ps1 @@ -41,7 +41,8 @@ $commonArgs = @( $Triplet,
"--x-buildtrees-root=$buildtreesRoot",
"--x-install-root=$installRoot",
- "--x-packages-root=$packagesRoot"
+ "--x-packages-root=$packagesRoot",
+ "--overlay-ports=scripts/e2e_ports"
)
$CurrentTest = 'unassigned'
@@ -190,6 +191,31 @@ if ((Get-ChildItem $NuGetRoot -Filter '*.nupkg' | Measure-Object).Count -ne 1) { throw "In '$CurrentTest': did not create exactly 1 NuGet package"
}
+# Test that prohibiting backcompat features actually prohibits
+$backcompatFeaturePorts = @('vcpkg-uses-test-cmake', 'vcpkg-uses-vcpkg-common-functions')
+foreach ($backcompatFeaturePort in $backcompatFeaturePorts) {
+ $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching')
+ $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features')
+ $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')"
+ Write-Host $CurrentTest
+ ./vcpkg @failArgs
+ if ($LastExitCode -ne 0) {
+ Write-Host "... failed (this is good!)"
+ } else {
+ throw $CurrentTest
+ }
+
+ # Install failed when prohibiting backcompat features, so it should succeed if we allow them
+ $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')"
+ Write-Host $CurrentTest
+ ./vcpkg @succeedArgs
+ if ($LastExitCode -ne 0) {
+ throw $CurrentTest
+ } else {
+ Write-Host "... succeeded."
+ }
+}
+
# Test export
$CurrentTest = 'Prepare for export test'
Write-Host $CurrentTest
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index 2fad7f0ed..4aeb9524a 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -1,51 +1 @@ -include(execute_process) -include(vcpkg_acquire_msys) -include(vcpkg_add_to_path) -include(vcpkg_check_features) -include(vcpkg_check_linkage) -include(vcpkg_clean_executables_in_bin) -include(vcpkg_clean_msbuild) -include(vcpkg_download_distfile) -include(vcpkg_extract_source_archive) -include(vcpkg_extract_source_archive_ex) -include(vcpkg_execute_required_process) -include(vcpkg_execute_required_process_repeat) -include(vcpkg_execute_build_process) -include(vcpkg_fail_port_install) -include(vcpkg_find_acquire_program) -include(vcpkg_fixup_cmake_targets) -include(vcpkg_fixup_pkgconfig) -include(vcpkg_from_github) -include(vcpkg_from_gitlab) -include(vcpkg_from_bitbucket) -include(vcpkg_from_sourceforge) -include(vcpkg_build_cmake) -include(vcpkg_build_gn) -include(vcpkg_build_msbuild) -include(vcpkg_build_qmake) -include(vcpkg_build_make) -include(vcpkg_build_ninja) -include(vcpkg_build_nmake) -include(vcpkg_install_cmake) -include(vcpkg_install_gn) -include(vcpkg_install_meson) -include(vcpkg_install_msbuild) -include(vcpkg_install_make) -include(vcpkg_install_nmake) -include(vcpkg_install_qmake) -include(vcpkg_configure_cmake) -include(vcpkg_configure_gn) -include(vcpkg_configure_meson) -include(vcpkg_configure_qmake) -include(vcpkg_configure_make) -include(vcpkg_apply_patches) -include(vcpkg_copy_pdbs) -include(vcpkg_copy_tool_dependencies) -include(vcpkg_copy_tools) -include(vcpkg_get_program_files_platform_bitness) -include(vcpkg_get_windows_sdk) -include(vcpkg_replace_string) -include(vcpkg_from_git) -include(vcpkg_test_cmake) -include(vcpkg_prettify_command) -include(vcpkg_buildpath_length_warning) +message("${_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_common_functions has been removed and all values are automatically provided in all portfile.cmake invocations. Please remove `include(vcpkg_common_functions)`.")
diff --git a/scripts/cmake/vcpkg_test_cmake.cmake b/scripts/cmake/vcpkg_test_cmake.cmake index eeb27867c..48d247f67 100644 --- a/scripts/cmake/vcpkg_test_cmake.cmake +++ b/scripts/cmake/vcpkg_test_cmake.cmake @@ -1,24 +1,3 @@ -## # vcpkg_test_cmake -## -## Tests a built package for CMake `find_package()` integration. -## -## ## Usage: -## ```cmake -## vcpkg_test_cmake(PACKAGE_NAME <name> [MODULE]) -## ``` -## -## ## Parameters: -## -## ### PACKAGE_NAME -## The expected name to find with `find_package()`. -## -## ### MODULE -## Indicates that the library expects to be found via built-in CMake targets. -## -function(vcpkg_test_cmake) - # The following issues need to be addressed before re-enabling this function. - # 1. Use the actual vcpkg toolchain file. - # 2. Select a generator in the same method as vcpkg_configure_cmake() as though the PREFER_NINJA flag was always passed. - # 3. Fully emulate the toolchain file for the just-built package (just adding it to CMAKE_PREFIX_PATH is not enough). - return() -endfunction() +function(vcpkg_test_cmake)
+ message("${_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_test_cmake was a no-op and has been removed. Please remove the call to `vcpkg_test_cmake()`.")
+endfunction()
diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake new file mode 100644 index 000000000..571ae3b7a --- /dev/null +++ b/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+vcpkg_test_cmake(args args args)
diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json new file mode 100644 index 000000000..9f34e058d --- /dev/null +++ b/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json @@ -0,0 +1,6 @@ +{
+ "name": "vcpkg-uses-test-cmake",
+ "version-string": "1.0.0",
+ "description": "A test port that uses the deprecated function vcpkg_test_cmake.",
+ "homepage": ""
+}
diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake new file mode 100644 index 000000000..9207d30b1 --- /dev/null +++ b/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+include(vcpkg_common_functions)
diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json new file mode 100644 index 000000000..7c16ffe82 --- /dev/null +++ b/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json @@ -0,0 +1,6 @@ +{
+ "name": "vcpkg-uses-vcpkg-common-functions",
+ "version-string": "1.0.0",
+ "description": "A test port that uses the deprecated file vcpkg_common_functions.",
+ "homepage": ""
+}
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 5e21e3d7d..c05323ec9 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -6,6 +6,13 @@ macro(debug_message) endif() endmacro() +option(_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES "Controls whether use of a backcompat only support feature fails the build.") +if (_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES) + set(_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "FATAL_ERROR") +else() + set(_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING") +endif() + if((NOT DEFINED VCPKG_ROOT_DIR) OR (NOT DEFINED DOWNLOADS) OR (NOT DEFINED _VCPKG_INSTALLED_DIR) @@ -29,7 +36,6 @@ if(PORT) set(CURRENT_PACKAGES_DIR ${PACKAGES_DIR}/${PORT}_${TARGET_TRIPLET}) endif() - if(CMD MATCHES "^BUILD$") set(CMAKE_TRIPLET_FILE ${TARGET_TRIPLET_FILE}) if(NOT EXISTS ${CMAKE_TRIPLET_FILE}) @@ -75,7 +81,57 @@ if(CMD MATCHES "^BUILD$") set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE}) include(${SCRIPTS}/cmake/vcpkg_common_definitions.cmake) - include(${SCRIPTS}/cmake/vcpkg_common_functions.cmake) + include(execute_process) + include(vcpkg_acquire_msys) + include(vcpkg_add_to_path) + include(vcpkg_apply_patches) + include(vcpkg_build_cmake) + include(vcpkg_build_gn) + include(vcpkg_build_make) + include(vcpkg_build_msbuild) + include(vcpkg_build_ninja) + include(vcpkg_build_nmake) + include(vcpkg_build_qmake) + include(vcpkg_buildpath_length_warning) + include(vcpkg_check_features) + include(vcpkg_check_linkage) + include(vcpkg_clean_executables_in_bin) + include(vcpkg_clean_msbuild) + include(vcpkg_configure_cmake) + include(vcpkg_configure_gn) + include(vcpkg_configure_make) + include(vcpkg_configure_meson) + include(vcpkg_configure_qmake) + include(vcpkg_copy_pdbs) + include(vcpkg_copy_tool_dependencies) + include(vcpkg_copy_tools) + include(vcpkg_download_distfile) + include(vcpkg_execute_build_process) + include(vcpkg_execute_required_process) + include(vcpkg_execute_required_process_repeat) + include(vcpkg_extract_source_archive) + include(vcpkg_extract_source_archive_ex) + include(vcpkg_fail_port_install) + include(vcpkg_find_acquire_program) + include(vcpkg_fixup_cmake_targets) + include(vcpkg_fixup_pkgconfig) + include(vcpkg_from_bitbucket) + include(vcpkg_from_git) + include(vcpkg_from_github) + include(vcpkg_from_gitlab) + include(vcpkg_from_sourceforge) + include(vcpkg_get_program_files_platform_bitness) + include(vcpkg_get_windows_sdk) + include(vcpkg_install_cmake) + include(vcpkg_install_gn) + include(vcpkg_install_make) + include(vcpkg_install_meson) + include(vcpkg_install_msbuild) + include(vcpkg_install_nmake) + include(vcpkg_install_qmake) + include(vcpkg_prettify_command) + include(vcpkg_replace_string) + include(vcpkg_test_cmake) include(${CURRENT_PORT_DIR}/portfile.cmake) if(DEFINED PORT) include(${SCRIPTS}/build_info.cmake) diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 7ddf662e8..5cd363ddc 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -75,6 +75,3 @@ vcpkg_install_cmake() # # Handle copyright # file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/@PORT@ RENAME copyright) - -# # Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME @PORT@) diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 4a3b39638..4cbde1cb1 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -133,6 +133,12 @@ namespace vcpkg::Build YES }; + enum class BackcompatFeatures + { + ALLOW = 0, + PROHIBIT + }; + struct BuildPackageOptions { UseHeadVersion use_head_version; @@ -144,6 +150,7 @@ namespace vcpkg::Build DownloadTool download_tool; PurgeDecompressFailure purge_decompress_failure; Editable editable; + BackcompatFeatures backcompat_features; }; static constexpr BuildPackageOptions default_build_package_options{ @@ -156,6 +163,20 @@ namespace vcpkg::Build Build::DownloadTool::BUILT_IN, Build::PurgeDecompressFailure::YES, Build::Editable::NO, + Build::BackcompatFeatures::ALLOW, + }; + + static constexpr BuildPackageOptions backcompat_prohibiting_package_options{ + Build::UseHeadVersion::NO, + Build::AllowDownloads::YES, + Build::OnlyDownloads::NO, + Build::CleanBuildtrees::YES, + Build::CleanPackages::YES, + Build::CleanDownloads::NO, + Build::DownloadTool::BUILT_IN, + Build::PurgeDecompressFailure::YES, + Build::Editable::NO, + Build::BackcompatFeatures::PROHIBIT, }; static constexpr std::array<BuildResult, 6> BUILD_RESULT_VALUES = { diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 7eaaf6aad..c517750d8 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -611,6 +611,12 @@ namespace vcpkg::Build {"FEATURES", Strings::join(";", action.feature_list)}, {"ALL_FEATURES", all_features}, }; + + if (action.build_options.backcompat_features == BackcompatFeatures::PROHIBIT) + { + variables.emplace_back("_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES", "1"); + } + get_generic_cmake_build_args( paths, triplet, diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index de3c522f8..7741b55e8 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -342,7 +342,7 @@ namespace vcpkg::Commands::CI auto emp = ret->default_feature_provider.emplace(p->spec.name(), scfl->clone()); emp.first->second.source_control_file->core_paragraph->default_features = p->feature_list; - p->build_options = vcpkg::Build::default_build_package_options; + p->build_options = vcpkg::Build::backcompat_prohibiting_package_options; } auto precheck_result = binaryprovider.precheck(paths, action); @@ -512,7 +512,7 @@ namespace vcpkg::Commands::CI } else { - action.build_options = vcpkg::Build::default_build_package_options; + action.build_options = vcpkg::Build::backcompat_prohibiting_package_options; } } diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index a83c6c976..f916100fa 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -513,8 +513,9 @@ namespace vcpkg::Install static constexpr StringLiteral OPTION_WRITE_PACKAGES_CONFIG = "x-write-nuget-packages-config"; static constexpr StringLiteral OPTION_MANIFEST_NO_DEFAULT_FEATURES = "x-no-default-features"; static constexpr StringLiteral OPTION_MANIFEST_FEATURE = "x-feature"; + static constexpr StringLiteral OPTION_PROHIBIT_BACKCOMPAT_FEATURES = "x-prohibit-backcompat-features"; - static constexpr std::array<CommandSwitch, 9> INSTALL_SWITCHES = {{ + static constexpr std::array<CommandSwitch, 10> INSTALL_SWITCHES = {{ {OPTION_DRY_RUN, "Do not actually build or install"}, {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"}, {OPTION_NO_DOWNLOADS, "Do not download new sources"}, @@ -522,9 +523,13 @@ namespace vcpkg::Install {OPTION_RECURSE, "Allow removal of packages as part of installation"}, {OPTION_KEEP_GOING, "Continue installing packages on failure"}, {OPTION_EDITABLE, "Disable source re-extraction and binary caching for libraries on the command line"}, + {OPTION_USE_ARIA2, "Use aria2 to perform download tasks"}, {OPTION_CLEAN_AFTER_BUILD, "Clean buildtrees, packages and downloads after building each package"}, + {OPTION_PROHIBIT_BACKCOMPAT_FEATURES, + "(experimental) Fail install if a package attempts to use a deprecated feature"}, }}; + static constexpr std::array<CommandSwitch, 10> MANIFEST_INSTALL_SWITCHES = {{ {OPTION_DRY_RUN, "Do not actually build or install"}, {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"}, @@ -758,6 +763,8 @@ namespace vcpkg::Install const bool clean_after_build = Util::Sets::contains(options.switches, (OPTION_CLEAN_AFTER_BUILD)); const KeepGoing keep_going = to_keep_going(Util::Sets::contains(options.switches, OPTION_KEEP_GOING) || only_downloads); + const bool prohibit_backcompat_features = + Util::Sets::contains(options.switches, (OPTION_PROHIBIT_BACKCOMPAT_FEATURES)); auto& fs = paths.get_filesystem(); @@ -774,6 +781,7 @@ namespace vcpkg::Install download_tool, Build::PurgeDecompressFailure::NO, Util::Enum::to_enum<Build::Editable>(is_editable), + prohibit_backcompat_features ? Build::BackcompatFeatures::PROHIBIT : Build::BackcompatFeatures::ALLOW, }; PortFileProvider::PathsPortFileProvider provider(paths, args.overlay_ports); diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index bd3e208ff..1d4746056 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -416,15 +416,10 @@ If you wish to silence this error and use classic mode, you can: auto& fs = this->get_filesystem(); std::map<std::string, std::string> helpers; auto files = fs.get_files_non_recursive(this->scripts / fs::u8path("cmake")); - auto common_functions = fs::u8path("vcpkg_common_functions"); for (auto&& file : files) { - auto stem = file.stem(); - if (stem != common_functions) - { - helpers.emplace(fs::u8string(stem), - Hash::get_file_hash(VCPKG_LINE_INFO, fs, file, Hash::Algorithm::Sha1)); - } + helpers.emplace(fs::u8string(file.stem()), + Hash::get_file_hash(VCPKG_LINE_INFO, fs, file, Hash::Algorithm::Sha1)); } return helpers; }); |