[vcpkg scripts] Crosscompiling fixes

ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt

@@ -126,7 +126,7 @@ if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
     string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"")
 endif()
 
-foreach(flags CXX C SHARED_LINKER EXE_LINKER)
+foreach(flags CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER MODULE_LINKER)
     set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}} ${EXTRA_FLAGS}")
 endforeach()
 

scripts/azure-pipelines/azure-pipelines.yml

@@ -13,54 +13,54 @@ parameters:
     default: 'use default'
 
 jobs:
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: x86-windows
-    jobName: x86_windows
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: x86-windows
+#    jobName: x86_windows
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: x64-windows
-    jobName: x64_windows
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: x64-windows
+#    jobName: x64_windows
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: x64-windows-static
-    jobName: x64_windows_static
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: x64-windows-static
+#    jobName: x64_windows_static
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: x64-windows-static-md
-    jobName: x64_windows_static_md
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: x64-windows-static-md
+#    jobName: x64_windows_static_md
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: x64-uwp
-    jobName: x64_uwp
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: x64-uwp
+#    jobName: x64_uwp
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: arm64-windows
-    jobName: arm64_windows
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: arm64-windows
+#    jobName: arm64_windows
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
-- template: windows/azure-pipelines.yml
-  parameters:
-    triplet: arm-uwp
-    jobName: arm_uwp
-    poolName: $(windows-pool)
-    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+#- template: windows/azure-pipelines.yml
+#  parameters:
+#    triplet: arm-uwp
+#    jobName: arm_uwp
+#    poolName: $(windows-pool)
+#    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
 
 - template: osx/azure-pipelines.yml
   parameters:

scripts/cmake/vcpkg_configure_make.cmake

@@ -74,8 +74,8 @@ macro(z_vcpkg_determine_autotools_target_arch_mac out_var)
 endmacro()
 
 macro(z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags flag_suffix)
-    string(REGEX MATCHALL "( |^)-D[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
-    string(REGEX MATCHALL "( |^)-D[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
+    string(REGEX MATCHALL "( |^)(-D|-isysroot|-isystem|-m?[Aa][Rr][Cc][Hh]) ?[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
+    string(REGEX MATCHALL "( |^)(-D|-isysroot|-isystem|-m?[Aa][Rr][Cc][Hh]) ?[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
     list(JOIN CXXPPFLAGS_${flag_suffix} "|" CXXREGEX)
     if(CXXREGEX)
         list(FILTER CPPFLAGS_${flag_suffix} INCLUDE REGEX "(${CXXREGEX})")
@@ -384,7 +384,7 @@ function(vcpkg_configure_make)
             # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive"
             list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all)
         endif()
-    elseif(NOT VCPKG_TARGET_IS_OSX)
+    else()
         # Because OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++
         function(z_vcpkg_make_set_env envvar cmakevar)
             set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}} ${ARGN}")

scripts/cmake/vcpkg_configure_meson.cmake

@@ -137,17 +137,6 @@ function(z_vcpkg_meson_generate_flags_properties_string out_var config_type)
         set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}")
     endif()
     z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}")
-    if(VCPKG_TARGET_IS_OSX)
-        # macOS - append arch and isysroot if cross-compiling
-        if(NOT "${VCPKG_OSX_ARCHITECTURES}" STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
-            foreach(arch IN LISTS VCPKG_OSX_ARCHITECTURES)
-                vcpkg_list(APPEND linker_flags -arch "${arch}")
-            endforeach()
-        endif()
-        if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT)
-            vcpkg_list(APPEND linker_flags -isysroot "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}")
-        endif()    
-    endif()
     vcpkg_list(APPEND linker_flags "${libpath}")
     z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags})
     string(APPEND result "c_link_args = ${linker_flags}\n")

scripts/cmake/z_vcpkg_get_cmake_vars.cmake

@@ -17,6 +17,7 @@ function(z_vcpkg_get_cmake_vars out_file)
             CACHE PATH "The file to include to access the CMake variables from a generated project.")
         vcpkg_configure_cmake(
             SOURCE_PATH "${SCRIPTS}/get_cmake_vars"
+            OPTIONS --trace-expand
             OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log"
             OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log"
             PREFER_NINJA

scripts/get_cmake_vars/CMakeLists.txt

@@ -44,7 +44,7 @@ list(APPEND VCPKG_DEFAULT_ENV_VARS_TO_CHECK PATH INCLUDE C_INCLUDE_PATH CPLUS_IN
 list(REMOVE_DUPLICATES VCPKG_DEFAULT_ENV_VARS_TO_CHECK)
 
 #Flags to check. Flags are a bit special since they are configuration aware. 
-set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER)
+set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER MODULE_LINKER)
 foreach(flag IN LISTS FLAGS)
     list(APPEND VCPKG_DEFAULT_FLAGS_TO_CHECK CMAKE_${flag}_FLAGS)
 endforeach()
@@ -98,7 +98,8 @@ macro(_vcpkg_adjust_flags flag_var)
             endif()
         endif()
     endif()
-    if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    if(APPLE)
+        list(APPEND VCPKG_LANG_FLAGS CMAKE_SHARED_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS)
         if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS)
             # macOS - append arch and isysroot if cross-compiling
             if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}")
@@ -129,7 +130,6 @@ foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK)
     endforeach()
 endforeach()
 
-
 file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}")
 
 # Programs: