Fixup

Author: halx99

1k/build.profiles

@@ -10,7 +10,7 @@ axslcc=1.9.6+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
-cmake=3.30.0~4.1.0+
+cmake=3.30.0~4.1.1+
 
 # The ninja
 ninja=1.10.0~1.12.1+

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Fix Label SDF rendering issues with font resizing and other bugs by @halx99 in https://github.com/axmolengine/axmol/pull/2625
 - Fix compile error when project contains swift code by @halx99 in https://github.com/axmolengine/axmol/pull/2632
 - Fix wasm Downloader open file with wrong permision (#2666) by @AlexandreK38 in https://github.com/axmolengine/axmol/pull/2666
+- Fix failure in CMake 4.1 when targeting Windows: assembler not found by @halx99
 
 ## Improvements
 
@@ -32,12 +33,13 @@
 - Improve tests (Naming of menu entries on cpp-/lua- tests) by @aismann in https://github.com/axmolengine/axmol/pull/2640
 - Move SIMD availability detection into its own CMake file by @j-jorge in https://github.com/axmolengine/axmol/pull/2642
 - Setting CMAKE_MSVC_DEBUG_INFORMATION_FORMAT to Embedded to resolve pdb too large problem by @halx99
+- Improve NuGet package management by @halx99 in https://github.com/axmolengine/axmol/pull/2671
 
 ## SDK & Tools updates
 
 - agp: 8.11.0 => 8.11.1
 - gradle: 8.14.3 => 9.0.0
-- cmake: 4.0.3 => 4.1.0
+- cmake: 4.0.3 => 4.1.1
 
 ## 3rdparty updates
 

cmake/Modules/AXConfigDefine.cmake

@@ -11,12 +11,6 @@ if(MSVC)
   cmake_minimum_required(VERSION 3.25...4.1)
   cmake_policy(SET CMP0141 NEW)
   set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
-
-  set(AX_MSEDGE_WEBVIEW2_VERSION "1.0.3405.78" CACHE STRING "")
-
-  set(_NUGET_PACKAGE_DIR "${_AX_ROOT}/cache/packages" CACHE INTERNAL "" FORCE)
-  file(TO_NATIVE_PATH ${_NUGET_PACKAGE_DIR} _NUGET_PACKAGE_DIR_N)
-  set(_NUGET_PACKAGE_DIR_N "${_NUGET_PACKAGE_DIR_N}" CACHE INTERNAL "" FORCE)
 endif()
 
 # UWP min deploy target support, VS property: targetPlatformMinVersion
@@ -29,6 +23,12 @@ if(WINRT)
   # For axmol deprecated policy, we need disable /sdl checks explicitly to avoid compiler traits invoking deprecated functions as error
   set(CMAKE_C_FLAGS "/sdl- ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "/sdl- ${CMAKE_CXX_FLAGS}")
+elseif(WIN32)
+  set(AX_MSEDGE_WEBVIEW2_VERSION "1.0.3405.78" CACHE STRING "")
+
+  set(_NUGET_PACKAGE_DIR "${_AX_ROOT}/cache/packages" CACHE INTERNAL "" FORCE)
+  file(TO_NATIVE_PATH ${_NUGET_PACKAGE_DIR} _NUGET_PACKAGE_DIR_N)
+  set(_NUGET_PACKAGE_DIR_N "${_NUGET_PACKAGE_DIR_N}" CACHE INTERNAL "" FORCE)
 endif()
 
 # config c standard