microsoft · Alexander Neumann (Neumann-A) · Aug 15, 2023 · Aug 15, 2023 · Aug 16, 2023 · Aug 17, 2023
diff --git a/.gitignore b/.gitignore
@@ -280,7 +280,7 @@ __pycache__/
 # vcpkg - Start
 ############################################################
 
-.vscode/
+#.vscode/
 *.code-workspace
 /buildtrees/
 /build*/

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+    // Verwendet IntelliSense zum Ermitteln möglicher Attribute.
+    // Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
+    // Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "type": "cmake",
+            "cmakeDebugType" : "external",
+            "request": "launch",
+            "name": "vcpkg-external-debug",
+            "pipeName": "\\\\.\\pipe\\vcpkg-cmake-debugging"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.generator" : "Ninja"
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,95 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "Remove-vcpkg-make-test",
+        "type": "shell",  
+        "command": "${workspaceFolder}/vcpkg remove vcpkg-make --recurse",
+      },
+      {
+        "label": "Debug CMake configure within vcpkg",
+        "type": "shell",
+        "dependsOn" : [
+          "Remove-vcpkg-make-test"
+        ],
+        "command": "${workspaceFolder}/vcpkg",
+        "args" : [
+          "install",
+          "vcpkg-make-test",
+          "--binarysource=clear",
+          "--x-cmake-args=-DVCPKG_CMAKE_CONFIGURE_OPTIONS=--debugger;--debugger-pipe=\\\\.\\pipe\\vcpkg-cmake-debugging"
+        ],
+        "isBackground": true,
+        "group": "none",
+        "presentation": {
+          "reveal": "always",
+          "panel": "new"
+        },
+        "problemMatcher": [
+          {
+          "pattern": [
+              {
+              "regexp": ".",
+              "file": 1,
+              "location": 2,
+              "message": 3
+              }
+          ],
+          "background": {
+              "activeOnStart": true,
+              "beginsPattern": "Computing installation plan",
+              "endsPattern": "Configuring x64-windows-release",
+          }
+          }
+      ]
+      },
+      {
+        "label": "Debug portfile execution",
+        "type": "shell",
+        "dependsOn" : [
+          "Remove-vcpkg-make-test"
+        ],
+        "command": "${workspaceFolder}/vcpkg",
+        "args" : [
+          "install",
+          "vcpkg-make-test",
+          "--binarysource=clear",
+          "--x-cmake-args=--debugger",
+          "--x-cmake-args=--debugger-pipe=\\\\.\\pipe\\vcpkg-cmake-debugging"
+        ],
+        "isBackground": true,
+        "group": "none",
+        "presentation": {
+          "reveal": "always",
+          "panel": "new"
+        },
+        "problemMatcher": [
+          {
+          "pattern": [
+              {
+              "regexp": ".",
+              "file": 1,
+              "location": 2,
+              "message": 3
+              }
+          ],
+          "background": {
+              "activeOnStart": true,
+              "beginsPattern": "Computing installation plan",
+              "endsPattern": "Configuring x64-windows-release",
+          }
+          }
+      ]
+      },
+      {
+        "type": "cmake",
+        "label": "CMake: Installieren",
+        "command": "install",
+        "problemMatcher": [],
+        "detail": "CMake-Vorlage Installieren Aufgabe"
+      },
+
+    ]
+}
diff --git a/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt
@@ -194,6 +194,7 @@ foreach(flag ${VCPKG_LANGUAGES} SHARED_LINKER EXE_LINKER STATIC_LINKER MODULE_LI
             endif()
         endif()
     endif()
+    string(STRIP "${${flag}_FLAGS}" "${flag}_FLAGS")
     escaped(value "${${flag}_FLAGS}")
     string(APPEND OUTPUT_STRING "set(VCPKG_COMBINED_${flag}_FLAGS_${VCPKG_CONFIGS} \"${value}\")\n")
 endforeach()

diff --git a/ports/vcpkg-cmake-get-vars/vcpkg.json b/ports/vcpkg-cmake-get-vars/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake-get-vars",
-  "version-date": "2023-03-02",
+  "version-date": "2023-08-18",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "dependencies": [

diff --git a/ports/vcpkg-make-test/portfile.cmake b/ports/vcpkg-make-test/portfile.cmake
@@ -0,0 +1,4 @@
+vcpkg_make_configure()
+vcpkg_make_install()
+
+# Note to self: Force install local cmake extension with external debugger support via:  code --install-extension .\cmake-tools.vsix --force
diff --git a/ports/vcpkg-make-test/vcpkg.json b/ports/vcpkg-make-test/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "vcpkg-make-test",
+  "version-date": "2023-05-15",
+  "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-make.html",
+  "license": "MIT",
+  "supports": "native",
+  "dependencies" : [
+    "vcpkg-make"
+  ]
+}
diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
@@ -0,0 +1,34 @@
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
+
+vcpkg_download_distfile(
+    ar_lib_wrapper
+    URLS https://raw.githubusercontent.com/autotools-mirror/automake/43a53bdf4b76377b5c012b8c8e8f478fb56d1ec0/lib/ar-lib
+    FILENAME ar-lib
+    SHA512 6019ffebf4b7b0547aa018c7d19bc915a228825d2acdee953a36919a88c30352e620f61c27a3e6f701af2885c8eb8d4ba3a4a3c2e821c54c03dceeef8eec108f
+)
+vcpkg_download_distfile(
+    compile_wrapper
+    URLS https://raw.githubusercontent.com/autotools-mirror/automake/43a53bdf4b76377b5c012b8c8e8f478fb56d1ec0/lib/compile
+    FILENAME compile
+    SHA512 3ef82f486f59be4cae1f1f95a9b70d4404f0333100be84c2e7061bd466201224a2bd1c7d871d97801eb9a441809bb47e7821fca8c85c29cc43ab15e6edda7f8c
+)
+
+file(COPY 
+        "${CMAKE_CURRENT_LIST_DIR}/" 
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+file(COPY 
+        "${ar_lib_wrapper}"
+        "${compile_wrapper}"
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
+)
+
+file(REMOVE 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/portfile.cmake"
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg.json"
+)
+
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
+
diff --git a/ports/vcpkg-make/vcpkg-make-common.cmake b/ports/vcpkg-make/vcpkg-make-common.cmake
@@ -0,0 +1,194 @@
+include_guard(GLOBAL)
+
+### Mapping variables
+macro(z_vcpkg_make_set_common_vars)
+    set(path_suffix_RELEASE "")
+    set(path_suffix_DEBUG "/debug")
+    set(suffix_RELEASE "rel")
+    set(suffix_DEBUG "dbg")
+    foreach(config IN ITEMS RELEASE DEBUG)
+        set("workdir_${config}" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${config}}")
+    endforeach()
+endmacro()
+
+####
+function(z_vcpkg_make_determine_arch out_var value)
+    if(${value} MATCHES "(amd|AMD)64")
+        set(${out_var} x86_64 PARENT_SCOPE)
+    elseif(${value} MATCHES "(x|X)86")
+        set(${out_var} i686 PARENT_SCOPE)
+    elseif(${value} MATCHES "^(ARM|arm)64$")
+        set(${out_var} aarch64 PARENT_SCOPE)
+    elseif(${value} MATCHES "^(ARM|arm)$")
+        set(${out_var} arm PARENT_SCOPE)
+    elseif(${value} MATCHES "^(x86_64|i686|aarch64|arm)$" OR NOT VCPKG_TARGET_IS_WINDOWS)
+        # Do nothing an assume valid architectures
+        set("${out_var}" "${value}" PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "Unsupported architecture '${value}' in '${CMAKE_CURRENT_FUNCTION}'!" )
+    endif()
+endfunction()
+
+function(z_vcpkg_make_determine_host_arch out_var)
+    if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+        set(arch $ENV{PROCESSOR_ARCHITEW6432})
+    elseif(DEFINED ENV{PROCESSOR_ARCHITECTURE})
+        set(arch $ENV{PROCESSOR_ARCHITECTURE})
+    else()
+        set(arch "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
+    endif()
+    z_vcpkg_make_determine_arch("${out_var}" "${arch}")
+    set("${out_var}" "${${out_var}}" PARENT_SCOPE)
+endfunction()
+
+function(z_vcpkg_make_determine_target_arch out_var)
+    list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num)
+    if(osx_archs_num GREATER_EQUAL 2 AND VCPKG_TARGET_IS_OSX)
+        set(${out_var} "universal")
+    else()
+        z_vcpkg_make_determine_arch(${out_var} "${VCPKG_TARGET_ARCHITECTURE}")
+    endif()
+    set("${out_var}" "${${out_var}}" PARENT_SCOPE)
+endfunction()
+
+
+function(z_vcpkg_make_prepare_compiler_flags)
+    cmake_parse_arguments(PARSE_ARGV 0 arg
+        "NO_CPP" 
+        "LIBS_OUT"
+        "LANGUAGES"
+    )
+    if(DEFINED arg_LANGUAGES)
+        # What a nice trick to get more output from vcpkg_cmake_get_vars if required
+        # But what will it return for ASM on windows? TODO: Needs actual testing
+        # list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_LANGUAGES=C\;CXX\;ASM") ASM compiler will point to CL with MSVC
+        list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_LANGUAGES=${arg_LANGUAGES}")
+    endif()
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+
+    #TODO: parent scope requiered vars
+
+endfunction()
+
+function(z_vcpkg_make_prepare_environment_common)
+endfunction()
+
+
+### General helper scripts (should maybe be moved to a seperate port)
+
+function(z_vcpkg_convert_to_msys_path outvar invar)
+    if(CMAKE_HOST_WIN32)
+        string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" current_installed_dir_msys "${invar}")
+    endif()
+    set("${outvar}" "${current_installed_dir_msys}" PARENT_SCOPE)
+endfunction()
+function(z_vcpkg_escape_spaces_in_path outvar invar)
+    string(REPLACE " " "\\ " current_installed_dir_escaped "${invar}")
+    set("${outvar}" "${current_installed_dir_escaped}" PARENT_SCOPE)
+endfunction()
+
+macro(z_vcpkg_unparsed_args warning_level)
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message("${warning_level}" "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+endmacro()
+
+macro(z_vcpkg_conflicting_args)
+    set(conflicting_args_set "")
+    foreach(z_vcpkg_conflicting_args_index RANGE 0 "${ARGC}")
+        if(${ARGV${z_vcpkg_conflicting_args_index}})
+            list(APPEND conflicting_args_set "${ARGV${z_vcpkg_conflicting_args_index}}")
+        endif()
+    endforeach()
+    list(LENGTH conflicting_args_set conflicting_args_set_length)
+    if(conflicting_args_set_length GREATER 1)
+        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed conflicting arguments:'${conflicting_args_set}'. Only one of those arguments can be passed")
+    endif()
+    unset(conflicting_args_set_length)
+    unset(conflicting_args_set)
+    unset(z_vcpkg_conflicting_args_index)
+endmacro()
+
+function(z_vcpkg_set_global_property property value)
+    if(DEFINED ARGN AND NOT ARGN MATCHES "^APPEND(_STRING)?$")
+        message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' called with invalid arguments '${ARGN}'")
+    endif()
+    set_property(GLOBAL ${ARGN} PROPERTY "z_vcpkg_global_property_${property}" ${value})
+endfunction()
+
+function(z_vcpkg_get_global_property outvar property)
+    if(DEFINED ARGN AND NOT ARGN STREQUAL "SET")
+        message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' called with invalid arguments '${ARGN}'")
+    endif()
+    get_property(outprop GLOBAL PROPERTY "z_vcpkg_global_property_${property}" ${ARGN})
+    set(${outvar} "${outprop}" PARENT_SCOPE)
+endfunction()
+
+function(z_vcpkg_warn_path_with_spaces)
+    vcpkg_list(SET z_vcm_paths_with_spaces)
+    if(CURRENT_BUILDTREES_DIR MATCHES " ")
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_BUILDTREES_DIR}")
+    endif()
+    if(CURRENT_PACKAGES_DIR MATCHES " ")
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_PACKAGES_DIR}")
+    endif()
+    if(CURRENT_INSTALLED_DIR MATCHES " ")
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_INSTALLED_DIR}")
+    endif()
+    if(z_vcm_paths_with_spaces)
+        # Don't bother with whitespace. The tools will probably fail and I tried very hard trying to make it work (no success so far)!
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "Please move the path to one without whitespaces!")
+        list(JOIN z_vcm_paths_with_spaces "\n   " z_vcm_paths_with_spaces)
+        message(STATUS "Warning: Paths with embedded space may be handled incorrectly by configure:\n   ${z_vcm_paths_with_spaces}")
+    endif()
+endfunctioN()
+
+###
+function(vcpkg_insert_msys_into_path msys_out)
+    cmake_parse_arguments(PARSE_ARGV 0 arg
+        "" 
+        "PATH_OUT"
+        "PACKAGES"
+    )
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${arg_ADDITIONAL_PACKAGES})
+    cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path_list NORMALIZE)
+    cmake_path(CONVERT "$ENV{SystemRoot}" TO_CMAKE_PATH_LIST system_root NORMALIZE)
+    cmake_path(CONVERT "$ENV{LOCALAPPDATA}" TO_CMAKE_PATH_LIST local_app_data NORMALIZE)
+    file(REAL_PATH "${system_root}" system_root)
+
+    vcpkg_list(SET find_system_dirs 
+        "${system_root}/system32"
+        "${system_root}/System32"
+        "${system_root}/system32/"
+        "${system_root}/System32/"
+        "${local_app_data}/Microsoft/WindowsApps"
+        "${local_app_data}/Microsoft/WindowsApps/"
+    )
+
+    string(TOUPPER "${find_system_dirs}" find_system_dirs_upper)
+
+    set(index 0)
+    set(appending TRUE)
+    foreach(item IN LISTS path_list)
+        if(item IN_LIST find_system_dirs OR item IN_LIST find_system_dirs_upper)
+            set(appending FALSE)
+            break()
+        endif()
+        math(EXPR index "${index} + 1")
+    endforeach()
+
+    if(appending)
+        message(WARNING "Unable to find system dir in the PATH variable! Appending required msys paths!")
+    endif()
+    vcpkg_list(INSERT path_list "${index}" "${MSYS_ROOT}/usr/bin")
+
+    cmake_path(CONVERT "${path_list}" TO_NATIVE_PATH_LIST native_path_list)
+    set(ENV{PATH} "${native_path_list}") # Should this be backed up?
+
+    if(DEFINED arg_PATH_OUT)
+        set("${arg_PATH_OUT}" "${path_list}" PARENT_SCOPE)
+    endif()
+
+    set("${msys_out}" "${MSYS_ROOT}" PARENT_SCOPE)
+endfunction()