From 1bb5ea10a3ff03783b37369eb5180a50557f3b0f Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 18 Feb 2021 16:27:47 -0800 Subject: [scripts-audit] vcpkg.cmake (#16061) * [vcpkg.cmake] modify to get in line with the audit See PR #16055 This also (attempts to) allow vcpkg.cmake to run with cmake 3.0; we had a VERSION_GREATER_EQUAL check, but that if keyword was added in cmake 3.7. * s/target_name/package_name in find_package * depend on z_vcpkg_function_arguments instead of a custom macro also, as a drive-by, switch to foreach(X IN LISTS ...) * split the utility macros/functions out additionally, move the options and settings to the top of the file * move more options and settings to the top * fix name of file * fix ras code comments * remove z_vcpkg_utilities due to export * add cmake_policy(PUSH|POP) * add VCPKG_INSTALLED_DIR input variable * add .cmakestamp to vcpkg_installed * fix osx ifs to use quotes also, remove spaces between if and (, to keep style consistent (mostly for ease of grepping...) * fix bug fixed by #16193 * move z_vcpkg_add_fatal_error up * fix RANGE for reals --- scripts/cmake/z_vcpkg_function_arguments.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/cmake') diff --git a/scripts/cmake/z_vcpkg_function_arguments.cmake b/scripts/cmake/z_vcpkg_function_arguments.cmake index 368ae3692..2c5b694ed 100644 --- a/scripts/cmake/z_vcpkg_function_arguments.cmake +++ b/scripts/cmake/z_vcpkg_function_arguments.cmake @@ -24,6 +24,9 @@ function(foo_replacement) endfunction() ``` #]===] + +# NOTE: this function definition is copied directly to scripts/buildsystems/vcpkg.cmake +# do not make changes here without making the same change there. macro(z_vcpkg_function_arguments OUT_VAR) if("${ARGC}" EQUAL 1) set(z_vcpkg_function_arguments_FIRST_ARG 0) -- cgit v1.2.3