aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2021-03-02 17:03:34 -0800
committerGitHub <noreply@github.com>2021-03-02 17:03:34 -0800
commitc47216ac7904b09187c119c7e4d010dcf993e3d5 (patch)
treef536f61764e6e59310b9fe8644d7d6354f94ecbc /scripts
parent395cb682bd8f9cc65228f48e40390f5241373659 (diff)
downloadvcpkg-c47216ac7904b09187c119c7e4d010dcf993e3d5.tar.gz
vcpkg-c47216ac7904b09187c119c7e4d010dcf993e3d5.zip
[vcpkg_*_cmake] remove deprecation message (#16480)
* [vcpkg_*_cmake] remove deprecation message to be replaced by a note in the maintainer-guide this allows existing ports to build without warnings, so as to avoid warning people unnecessarily, while still making sure people update when they update ports. * Update docs/maintainers/maintainer-guide.md
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_build_cmake.cmake5
-rw-r--r--scripts/cmake/vcpkg_configure_cmake.cmake1
-rw-r--r--scripts/cmake/vcpkg_fixup_cmake_targets.cmake1
-rw-r--r--scripts/cmake/vcpkg_install_cmake.cmake1
4 files changed, 1 insertions, 7 deletions
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 2b1571413..523999b4e 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -36,14 +36,11 @@ You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) functi
function(vcpkg_build_cmake)
cmake_parse_arguments(PARSE_ARGV 0 "arg"
- "DISABLE_PARALLEL;ADD_BIN_TO_PATH;Z_VCPKG_DISABLE_DEPRECATION_MESSAGE"
+ "DISABLE_PARALLEL;ADD_BIN_TO_PATH"
"TARGET;LOGFILE_ROOT"
""
)
- if(NOT arg_Z_VCPKG_DISABLE_DEPRECATION_MESSAGE)
- message(DEPRECATION "vcpkg_build_cmake has been deprecated in favor of vcpkg_cmake_build from the vcpkg-cmake port.")
- endif()
if(Z_VCPKG_CMAKE_BUILD_GUARD)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_build_cmake in the same port is unsupported.")
endif()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 2cb6dbf1a..1cac9f015 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -69,7 +69,6 @@ This command supplies many common arguments to CMake. To see the full list, exam
#]===]
function(vcpkg_configure_cmake)
- message(DEPRECATION "vcpkg_configure_cmake has been deprecated in favor of vcpkg_cmake_configure from the vcpkg-cmake port.")
if(Z_VCPKG_CMAKE_CONFIGURE_GUARD)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.")
endif()
diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index b2931120b..d4eae04a6 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -53,7 +53,6 @@ Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targe
#]===]
function(vcpkg_fixup_cmake_targets)
- message(DEPRECATION "vcpkg_fixup_cmake_targets has been deprecated in favor of vcpkg_cmake_config_fixup from the vcpkg-cmake-config port.")
if(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake-config; using both vcpkg-cmake-config and vcpkg_fixup_cmake_targets in the same port is unsupported.")
endif()
diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake
index bf752f643..82e6af05d 100644
--- a/scripts/cmake/vcpkg_install_cmake.cmake
+++ b/scripts/cmake/vcpkg_install_cmake.cmake
@@ -26,7 +26,6 @@ parameter.
#]===]
function(vcpkg_install_cmake)
- message(DEPRECATION "vcpkg_install_cmake has been deprecated in favor of vcpkg_cmake_install from the vcpkg-cmake port.")
if(Z_VCPKG_CMAKE_INSTALL_GUARD)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_install_cmake in the same port is unsupported.")
endif()