update to 17.12. calc some versions

microsoft · Nov 13, 2024 · 13f4af9 · 13f4af9
1 parent 5e74626
commit 13f4af9
Show file tree

Hide file tree

Showing 10 changed files with 917 additions and 5,834 deletions.
diff --git a/ports/msvc/download_msbuild.cmake b/ports/msvc/download_msbuild.cmake
diff --git a/ports/msvc/download_sdk.cmake b/ports/msvc/download_sdk.cmake
diff --git a/ports/msvc/download_toolkit.cmake b/ports/msvc/download_toolkit.cmake
diff --git a/ports/msvc/msbuild-config.cmake b/ports/msvc/msbuild-config.cmake
diff --git a/ports/msvc/msvc-env.cmake b/ports/msvc/msvc-env.cmake
@@ -5,9 +5,9 @@ if(NOT DEFINED ENV{VCPKG_TOOLCHAIN_ENV_ALREADY_SET})
   set(VS_DIR "${CMAKE_CURRENT_LIST_DIR}/../../VS")
   set(SDK_DIR "${CMAKE_CURRENT_LIST_DIR}/../../WinSDK")
 
-  set(WinSDK_VERSION "10.0.26100.0")
-  set(VCToolkit_VERSION "14.41.34120")
-  set(VCToolkit_REDIST_VERSION "14.40.33807")
+  set(WinSDK_VERSION "@WinSDK_VERSION@")
+  set(VCToolkit_VERSION "@VCToolkit_VERSION@")
+  set(VCToolkit_REDIST_VERSION "@VCToolkit_REDIST_VERSION@")
 
   set(LIB 
         "${VS_DIR}/VC/Tools/MSVC/${VCToolkit_VERSION}/ATLMFC/lib/x64"
@@ -65,9 +65,9 @@ if(NOT DEFINED ENV{VCPKG_TOOLCHAIN_ENV_ALREADY_SET})
   set(ENV{WindowsLibPath} "${WindowsLibPath}")
   set(ENV{WindowsSdkBinPath} "${SDK_DIR}/Windows Kits/10/bin/")
   set(ENV{WindowsSdkDir} "${SDK_DIR}/Windows Kits/10/")
-  set(ENV{WindowsSDKLibVersion} "${WinSDK_VERSION}/")
+  set(ENV{WindowsSDKLibVersion} "${WinSDK_VERSION}\\")
   set(ENV{WindowsSdkVerBinPath} "${SDK_DIR}/Windows Kits/10/bin/${WinSDK_VERSION}/")
-  set(ENV{WindowsSDKVersion} "${WinSDK_VERSION}/")
+  set(ENV{WindowsSDKVersion} "${WinSDK_VERSION}\\")
   #set(WindowsSDK_ExecutablePath_x64 "${SDK_DIR}/Windows/v10.0A/bin/NETFX 4.8 Tools/x64/")
   #set(WindowsSDK_ExecutablePath_x86 "${SDK_DIR}/Windows/v10.0A/bin/NETFX 4.8 Tools/")
 

diff --git a/ports/msvc/portfile.cmake b/ports/msvc/portfile.cmake
@@ -1,13 +1,9 @@
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-#set(VCPKG_POLICY_SKIP_COPYRIGHT_CHECK enabled)
+set(VCPKG_POLICY_SKIP_COPYRIGHT_CHECK enabled)
 
 find_program(pwsh_exe NAMES pwsh powershell)
 
-set(WinSDK_VERSION "10.0.26100.0")
-set(VCToolkit_VERSION "14.41.34120")
-set(VCToolkit_REDIST_VERSION "14.40.33807")
-
 include("${CMAKE_CURRENT_LIST_DIR}/portfile_winsdk.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/portfile_toolkit.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/portfile_msbuild.cmake")

diff --git a/ports/msvc/portfile_toolkit.cmake b/ports/msvc/portfile_toolkit.cmake
@@ -1,4 +1,4 @@
-block()
+block(PROPAGATE VCToolkit_VERSION VCToolkit_REDIST_VERSION)
   set(VCToolkit_FILES "")
   include("${CMAKE_CURRENT_LIST_DIR}/download_toolkit.cmake")
   set(prefix VCToolkit)
@@ -24,6 +24,10 @@ block()
         LOGNAME "extract_msbuild_${counter}.log"
       )
   endforeach()
+  file(GLOB vc_redist_version_folder LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/VS/VC/Redist/MSVC/*")
+  cmake_path(GET vc_redist_version_folder FILENAME VCToolkit_REDIST_VERSION)
+  file(GLOB vc_toolkit_version_folder LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/VS/VC/Tools/MSVC/*")
+  cmake_path(GET vc_toolkit_version_folder FILENAME VCToolkit_VERSION)
 endblock()
 
 #D:\vcpkg_folders\no_msvc\packages\msvc_x64-windows-release\VS\VC\Tools\MSVC\14.41.34120
diff --git a/ports/msvc/portfile_winsdk.cmake b/ports/msvc/portfile_winsdk.cmake
@@ -1,4 +1,4 @@
-block()
+block(PROPAGATE WinSDK_VERSION)
   set(WinSDK_FILES "")
   include("${CMAKE_CURRENT_LIST_DIR}/download_sdk.cmake")
 
@@ -86,20 +86,6 @@ block()
     )
     cmake_path(GET msi FILENAME packstem)
     string(REPLACE ".msi" "" packstem "${packstem}")
-    #vcpkg_execute_required_process(
-    #    COMMAND msiexec /a "${msi}" /lvoicewarmupx "msiexec_${componentName}.log" /quiet /qn "TARGETDIR=${installLocation}"
-    #    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
-    #    LOGNAME "msiexec_${componentName}_cmake.log"
-    #)
-
-    # Remove the MSI file from the install location
-    #file(REMOVE "${installLocation}/${filename}")
-
-    # Check if the install location has files or directories
-    #file(GLOB filesAndDirs "${installLocation}/${packstem}/*")
-    #if(NOT filesAndDirs)
-    #    message(STATUS "Installer had no files or dirs to extract")
-    #endif()
 
     # Copy the extracted files to the SDK install folder
     if(EXISTS "${installLocation}/${packstem}/SourceDir/")

diff --git a/ports/msvc/vctoolkit-config.cmake b/ports/msvc/vctoolkit-config.cmake
diff --git a/ports/msvc/winsdk-config.cmake b/ports/msvc/winsdk-config.cmake