Delete use of vcpkg_test_cmake and vcpkg_common_functions. (microsoft…

…#13065)
RickKra · Oct 28, 2020 · 09a647a · 09a647a
1 parent ead8d6b
commit 09a647a
Show file tree

Hide file tree

Showing 503 changed files with 167 additions and 1,207 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -1,16 +1,11 @@
-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
     )
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,5 @@
 # header-only library
 
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jkuhlmann/cgltf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)