Delete use of vcpkg_test_cmake and vcpkg_common_functions. (#13065)

2 files changed, 4 insertions, 75 deletions

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()