[world rebuild|toolchain] Fix try compile handling

scripts/buildsystems/vcpkg.cmake

@@ -591,8 +591,6 @@ endif()
 
 cmake_policy(POP)
 
-# Any policies applied to the below macros and functions appear to leak into consumers
-
 function(add_executable)
     z_vcpkg_function_arguments(ARGS)
     _add_executable(${ARGS})
@@ -889,10 +887,15 @@ if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE)
     list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
         VCPKG_TARGET_TRIPLET
         VCPKG_TARGET_ARCHITECTURE
-        VCPKG_APPLOCAL_DEPS
+        VCPKG_HOST_TRIPLET
+        VCPKG_INSTALLED_DIR
+        VCPKG_PREFER_SYSTEM_LIBS
+        # VCPKG_APPLOCAL_DEPS # This should be off within try_compile!
         VCPKG_CHAINLOAD_TOOLCHAIN_FILE
         Z_VCPKG_ROOT_DIR
     )
+else()
+    set(VCPKG_APPLOCAL_DEPS OFF)
 endif()
 
 if(Z_VCPKG_HAS_FATAL_ERROR)

scripts/test_ports/try-compile/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(try-compile-test LANGUAGES C CXX)
+
+try_compile(result PROJECT test-try-compile SOURCE_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/try")
+
+if(NOT result)
+  message(FATAL_ERROR "Compiler flags are not passed consistently to try_compile!")
+endif()

scripts/test_ports/try-compile/portfile.cmake

@@ -0,0 +1,9 @@
+
+string(APPEND VCPKG_C_FLAGS " -DVCPKG_LET_ME_PASS")
+string(APPEND VCPKG_CXX_FLAGS " -DVCPKG_LET_ME_PASS")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}"
+)
+
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

scripts/test_ports/try-compile/try/CMakeLists.txt

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(try-compile-project LANGUAGES C CXX)
+
+add_library(result "${CMAKE_CURRENT_SOURCE_DIR}/try-compile.c")
+

scripts/test_ports/try-compile/try/try-compile.c

@@ -0,0 +1,5 @@
+
+
+#if !defined(VCPKG_LET_ME_PASS)
+  #error "You shall not pass without forwarding compiler flags to try_compile!"
+#endif

scripts/test_ports/try-compile/vcpkg.json

@@ -0,0 +1,12 @@
+{
+  "name": "try-compile",
+  "version": "1",
+  "description": "Test if try compile correctly passes on compiler flags",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

scripts/toolchains/android.cmake

@@ -33,23 +33,41 @@ include("${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
 
 if(NOT _VCPKG_ANDROID_TOOLCHAIN)
     set(_VCPKG_ANDROID_TOOLCHAIN 1)
-    get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
-    if(NOT _CMAKE_IN_TRY_COMPILE)
-        string(APPEND CMAKE_C_FLAGS " -fPIC ${VCPKG_C_FLAGS} ")
-        string(APPEND CMAKE_CXX_FLAGS " -fPIC ${VCPKG_CXX_FLAGS} ")
-        string(APPEND CMAKE_C_FLAGS_DEBUG " ${VCPKG_C_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_CXX_FLAGS_DEBUG " ${VCPKG_CXX_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_C_FLAGS_RELEASE " ${VCPKG_C_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_CXX_FLAGS_RELEASE " ${VCPKG_CXX_FLAGS_RELEASE} ")
-
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
+
+    if(POLICY CMP0056)
+        cmake_policy(SET CMP0056 NEW)
+    endif()
+    if(POLICY CMP0066)
+        cmake_policy(SET CMP0066 NEW)
+    endif()
+    if(POLICY CMP0067)
+        cmake_policy(SET CMP0067 NEW)
     endif()
+    if(POLICY CMP0137)
+        cmake_policy(SET CMP0137 NEW)
+    endif()
+    list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+        VCPKG_CRT_LINKAGE VCPKG_TARGET_ARCHITECTURE
+        VCPKG_C_FLAGS VCPKG_CXX_FLAGS
+        VCPKG_C_FLAGS_DEBUG VCPKG_CXX_FLAGS_DEBUG
+        VCPKG_C_FLAGS_RELEASE VCPKG_CXX_FLAGS_RELEASE
+        VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE VCPKG_LINKER_FLAGS_DEBUG
+    )
+
+    string(APPEND CMAKE_C_FLAGS " -fPIC ${VCPKG_C_FLAGS} ")
+    string(APPEND CMAKE_CXX_FLAGS " -fPIC ${VCPKG_CXX_FLAGS} ")
+    string(APPEND CMAKE_C_FLAGS_DEBUG " ${VCPKG_C_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_CXX_FLAGS_DEBUG " ${VCPKG_CXX_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_C_FLAGS_RELEASE " ${VCPKG_C_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_CXX_FLAGS_RELEASE " ${VCPKG_CXX_FLAGS_RELEASE} ")
+
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()

scripts/toolchains/freebsd.cmake

@@ -1,24 +1,42 @@
 if(NOT _VCPKG_FREEBSD_TOOLCHAIN)
-set(_VCPKG_FREEBSD_TOOLCHAIN 1)
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
-    set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
-endif()
-set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "")
+    set(_VCPKG_FREEBSD_TOOLCHAIN 1)
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+        set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
+    endif()
+    set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "")
 
-if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR)
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-       set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-       set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-       set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "")
-    else()
-       set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "")
+    if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR)
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+           set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+           set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+           set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "")
+        else()
+           set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "")
+        endif()
     endif()
-endif()
 
-get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
-if(NOT _CMAKE_IN_TRY_COMPILE)
+    if(POLICY CMP0056)
+        cmake_policy(SET CMP0056 NEW)
+    endif()
+    if(POLICY CMP0066)
+        cmake_policy(SET CMP0066 NEW)
+    endif()
+    if(POLICY CMP0067)
+        cmake_policy(SET CMP0067 NEW)
+    endif()
+    if(POLICY CMP0137)
+        cmake_policy(SET CMP0137 NEW)
+    endif()
+    list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+        VCPKG_CRT_LINKAGE VCPKG_TARGET_ARCHITECTURE
+        VCPKG_C_FLAGS VCPKG_CXX_FLAGS
+        VCPKG_C_FLAGS_DEBUG VCPKG_CXX_FLAGS_DEBUG
+        VCPKG_C_FLAGS_RELEASE VCPKG_CXX_FLAGS_RELEASE
+        VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE VCPKG_LINKER_FLAGS_DEBUG
+    )
+
     string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
     string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
     string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
@@ -36,4 +54,3 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()
-endif()

scripts/toolchains/ios.cmake

@@ -1,6 +1,26 @@
 if(NOT _VCPKG_IOS_TOOLCHAIN)
     set(_VCPKG_IOS_TOOLCHAIN 1)
 
+    if(POLICY CMP0056)
+        cmake_policy(SET CMP0056 NEW)
+    endif()
+    if(POLICY CMP0066)
+        cmake_policy(SET CMP0066 NEW)
+    endif()
+    if(POLICY CMP0067)
+        cmake_policy(SET CMP0067 NEW)
+    endif()
+    if(POLICY CMP0137)
+        cmake_policy(SET CMP0137 NEW)
+    endif()
+    list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+        VCPKG_CRT_LINKAGE VCPKG_TARGET_ARCHITECTURE
+        VCPKG_C_FLAGS VCPKG_CXX_FLAGS
+        VCPKG_C_FLAGS_DEBUG VCPKG_CXX_FLAGS_DEBUG
+        VCPKG_C_FLAGS_RELEASE VCPKG_CXX_FLAGS_RELEASE
+        VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE VCPKG_LINKER_FLAGS_DEBUG
+    )
+
     # Set the CMAKE_SYSTEM_NAME for try_compile calls.
     set(CMAKE_SYSTEM_NAME iOS CACHE STRING "")
 
@@ -41,23 +61,20 @@ if(NOT _VCPKG_IOS_TOOLCHAIN)
         set(CMAKE_OSX_SYSROOT ${_vcpkg_ios_sysroot} CACHE STRING "iOS sysroot")
     endif()
 
-    get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
-    if(NOT _CMAKE_IN_TRY_COMPILE)
-        string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
-        string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
-        string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
-
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
-        string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
-        string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
-    endif()
+    string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
+    string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
+    string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
+
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()

scripts/toolchains/linux.cmake

@@ -1,56 +1,75 @@
 if(NOT _VCPKG_LINUX_TOOLCHAIN)
-set(_VCPKG_LINUX_TOOLCHAIN 1)
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-    set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
-endif()
-set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-   set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-   set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
-   string(APPEND VCPKG_C_FLAGS " -m32")
-   string(APPEND VCPKG_CXX_FLAGS " -m32")
-   string(APPEND VCPKG_LINKER_FLAGS " -m32")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "")
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")
+    set(_VCPKG_LINUX_TOOLCHAIN 1)
 
-        if(NOT DEFINED CMAKE_CXX_COMPILER)
-            set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")
-        endif()
-        if(NOT DEFINED CMAKE_C_COMPILER)
-            set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")
-        endif()
-        if(NOT DEFINED CMAKE_ASM_COMPILER)
-            set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc")
-        endif()
-        if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
-            set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as")
-        endif()
-        message(STATUS "Cross compiling arm on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
+    if(POLICY CMP0056)
+        cmake_policy(SET CMP0056 NEW)
+    endif()
+    if(POLICY CMP0066)
+        cmake_policy(SET CMP0066 NEW)
+    endif()
+    if(POLICY CMP0067)
+        cmake_policy(SET CMP0067 NEW)
+    endif()
+    if(POLICY CMP0137)
+        cmake_policy(SET CMP0137 NEW)
     endif()
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "")
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+        VCPKG_CRT_LINKAGE VCPKG_TARGET_ARCHITECTURE
+        VCPKG_C_FLAGS VCPKG_CXX_FLAGS
+        VCPKG_C_FLAGS_DEBUG VCPKG_CXX_FLAGS_DEBUG
+        VCPKG_C_FLAGS_RELEASE VCPKG_CXX_FLAGS_RELEASE
+        VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE VCPKG_LINKER_FLAGS_DEBUG
+    )
 
-        if(NOT DEFINED CMAKE_CXX_COMPILER)
-            set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")
-        endif()
-        if(NOT DEFINED CMAKE_C_COMPILER)
-            set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")
-        endif()
-        if(NOT DEFINED CMAKE_ASM_COMPILER)
-            set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
+    endif()
+    set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+       set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+       set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
+       string(APPEND VCPKG_C_FLAGS " -m32")
+       string(APPEND VCPKG_CXX_FLAGS " -m32")
+       string(APPEND VCPKG_LINKER_FLAGS " -m32")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+        set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "")
+        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")
+
+            if(NOT DEFINED CMAKE_CXX_COMPILER)
+                set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")
+            endif()
+            if(NOT DEFINED CMAKE_C_COMPILER)
+                set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc")
+            endif()
+            if(NOT DEFINED CMAKE_ASM_COMPILER)
+                set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc")
+            endif()
+            if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
+                set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as")
+            endif()
+            message(STATUS "Cross compiling arm on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
         endif()
-        if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
-            set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "")
+        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+
+            if(NOT DEFINED CMAKE_CXX_COMPILER)
+                set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")
+            endif()
+            if(NOT DEFINED CMAKE_C_COMPILER)
+                set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc")
+            endif()
+            if(NOT DEFINED CMAKE_ASM_COMPILER)
+                set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc")
+            endif()
+            if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
+                set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as")
+            endif()
+            message(STATUS "Cross compiling arm64 on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
         endif()
-        message(STATUS "Cross compiling arm64 on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
     endif()
-endif()
 
-get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
-if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
     string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
     string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
@@ -74,4 +93,3 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_ASM_FLAGS_INIT " ${VCPKG_C_FLAGS} ")
 endif()
-endif()