From c8a27715a9a3171fe3a488ef3ac6573baba6661f Mon Sep 17 00:00:00 2001 From: Jack Boswell Date: Wed, 23 Jul 2025 21:17:05 +1000 Subject: [PATCH] Replace DEPS_BITS with DEPS_ARCH (#10183) * Replace DEPS_BITS with DEPS_ARCH * Restore missing DEP_MSVC_GEN * STREQUAL * STREQUAL * Other cmakelists * webview2 rename --- CMakeLists.txt | 16 ++++++++------- deps/CMakeLists.txt | 12 +++++------ deps/GMP/GMP.cmake | 4 ++-- .../gmp/lib/{win64 => win-x64}/libgmp-10.dll | Bin .../gmp/lib/{win64 => win-x64}/libgmp-10.lib | Bin .../gmp/lib/{win32 => win-x86}/libgmp-10.dll | Bin .../gmp/lib/{win32 => win-x86}/libgmp-10.lib | Bin deps/MPFR/MPFR.cmake | 4 ++-- .../mpfr/lib/{win64 => win-x64}/libmpfr-4.dll | Bin .../mpfr/lib/{win64 => win-x64}/libmpfr-4.lib | Bin .../mpfr/lib/{win32 => win-x86}/libmpfr-4.dll | Bin .../mpfr/lib/{win32 => win-x86}/libmpfr-4.lib | Bin .../lib/{win64 => win-x64}/WebView2Loader.dll | Bin .../{win64 => win-x64}/WebView2Loader.dll.lib | Bin .../WebView2LoaderStatic.lib | Bin .../lib/{win32 => win-x86}/WebView2Loader.dll | Bin .../{win32 => win-x86}/WebView2Loader.dll.lib | Bin .../WebView2LoaderStatic.lib | Bin deps/deps-windows.cmake | 19 +++++++++--------- 19 files changed, 28 insertions(+), 27 deletions(-) rename deps/GMP/gmp/lib/{win64 => win-x64}/libgmp-10.dll (100%) rename deps/GMP/gmp/lib/{win64 => win-x64}/libgmp-10.lib (100%) rename deps/GMP/gmp/lib/{win32 => win-x86}/libgmp-10.dll (100%) rename deps/GMP/gmp/lib/{win32 => win-x86}/libgmp-10.lib (100%) rename deps/MPFR/mpfr/lib/{win64 => win-x64}/libmpfr-4.dll (100%) rename deps/MPFR/mpfr/lib/{win64 => win-x64}/libmpfr-4.lib (100%) rename deps/MPFR/mpfr/lib/{win32 => win-x86}/libmpfr-4.dll (100%) rename deps/MPFR/mpfr/lib/{win32 => win-x86}/libmpfr-4.lib (100%) rename deps/WebView2/lib/{win64 => win-x64}/WebView2Loader.dll (100%) rename deps/WebView2/lib/{win64 => win-x64}/WebView2Loader.dll.lib (100%) rename deps/WebView2/lib/{win64 => win-x64}/WebView2LoaderStatic.lib (100%) rename deps/WebView2/lib/{win32 => win-x86}/WebView2Loader.dll (100%) rename deps/WebView2/lib/{win32 => win-x86}/WebView2Loader.dll.lib (100%) rename deps/WebView2/lib/{win32 => win-x86}/WebView2LoaderStatic.lib (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61efb2233c..8931c4c7de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -699,10 +699,12 @@ endif() set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR}) function(orcaslicer_copy_dlls target config postfix output_dlls) - if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(_bits 64) - elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") - set(_bits 32) + if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") + set(_arch "x64") + elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86") + set(_arch "x86") + else () + message(FATAL_ERROR "Unable to detect architecture") endif () get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -719,9 +721,9 @@ function(orcaslicer_copy_dlls target config postfix output_dlls) message ("set out_dir to CMAKE_CURRENT_BINARY_DIR: ${_out_dir}") endif () - file(COPY ${TOP_LEVEL_PROJECT_DIR}/deps/GMP/gmp/lib/win${_bits}/libgmp-10.dll - ${TOP_LEVEL_PROJECT_DIR}/deps/MPFR/mpfr/lib/win${_bits}/libmpfr-4.dll - ${TOP_LEVEL_PROJECT_DIR}/deps/WebView2/lib/win${_bits}/WebView2Loader.dll + file(COPY ${TOP_LEVEL_PROJECT_DIR}/deps/GMP/gmp/lib/win-${_arch}/libgmp-10.dll + ${TOP_LEVEL_PROJECT_DIR}/deps/MPFR/mpfr/lib/win-${_arch}/libmpfr-4.dll + ${TOP_LEVEL_PROJECT_DIR}/deps/WebView2/lib/win-${_arch}/WebView2Loader.dll DESTINATION ${_out_dir}) file(COPY ${CMAKE_PREFIX_PATH}/bin/occt/TKBO.dll diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index dbb380e2d6..df099e7db4 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -203,13 +203,13 @@ endfunction(orcaslicer_add_cmake_project) if (MSVC) - if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - message(STATUS "\nDetected 64-bit compiler => building 64-bit deps bundle\n") - set(DEPS_BITS 64) + if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") + message(STATUS "\nDetected X64 compiler => building X64 deps bundle\n") + set(DEPS_ARCH "x64") include("deps-windows.cmake") - elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") - message(STATUS "\nDetected 32-bit compiler => building 32-bit deps bundle\n") - set(DEPS_BITS 32) + elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86") + message(STATUS "\nDetected X86 compiler => building X86 deps bundle\n") + set(DEPS_ARCH "x86") include("deps-windows.cmake") else () message(FATAL_ERROR "Unable to detect architecture") diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake index 2327014a66..623f01a171 100644 --- a/deps/GMP/GMP.cmake +++ b/deps/GMP/GMP.cmake @@ -13,8 +13,8 @@ if (MSVC) add_custom_command( OUTPUT ${_output} COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/gmp.h ${DESTDIR}/include/ - COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.lib ${DESTDIR}/lib/ - COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.dll ${DESTDIR}/bin/ + COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libgmp-10.lib ${DESTDIR}/lib/ + COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libgmp-10.dll ${DESTDIR}/bin/ ) add_custom_target(dep_GMP SOURCES ${_output}) diff --git a/deps/GMP/gmp/lib/win64/libgmp-10.dll b/deps/GMP/gmp/lib/win-x64/libgmp-10.dll similarity index 100% rename from deps/GMP/gmp/lib/win64/libgmp-10.dll rename to deps/GMP/gmp/lib/win-x64/libgmp-10.dll diff --git a/deps/GMP/gmp/lib/win64/libgmp-10.lib b/deps/GMP/gmp/lib/win-x64/libgmp-10.lib similarity index 100% rename from deps/GMP/gmp/lib/win64/libgmp-10.lib rename to deps/GMP/gmp/lib/win-x64/libgmp-10.lib diff --git a/deps/GMP/gmp/lib/win32/libgmp-10.dll b/deps/GMP/gmp/lib/win-x86/libgmp-10.dll similarity index 100% rename from deps/GMP/gmp/lib/win32/libgmp-10.dll rename to deps/GMP/gmp/lib/win-x86/libgmp-10.dll diff --git a/deps/GMP/gmp/lib/win32/libgmp-10.lib b/deps/GMP/gmp/lib/win-x86/libgmp-10.lib similarity index 100% rename from deps/GMP/gmp/lib/win32/libgmp-10.lib rename to deps/GMP/gmp/lib/win-x86/libgmp-10.lib diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index 437cd4fcd3..dc45aad7b8 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -10,8 +10,8 @@ if (MSVC) OUTPUT ${_output} COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpfr.h ${DESTDIR}/include/ COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpf2mpfr.h ${DESTDIR}/include/ - COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.lib ${DESTDIR}/lib/ - COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.dll ${DESTDIR}/bin/ + COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libmpfr-4.lib ${DESTDIR}/lib/ + COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libmpfr-4.dll ${DESTDIR}/bin/ ) add_custom_target(dep_MPFR SOURCES ${_output}) diff --git a/deps/MPFR/mpfr/lib/win64/libmpfr-4.dll b/deps/MPFR/mpfr/lib/win-x64/libmpfr-4.dll similarity index 100% rename from deps/MPFR/mpfr/lib/win64/libmpfr-4.dll rename to deps/MPFR/mpfr/lib/win-x64/libmpfr-4.dll diff --git a/deps/MPFR/mpfr/lib/win64/libmpfr-4.lib b/deps/MPFR/mpfr/lib/win-x64/libmpfr-4.lib similarity index 100% rename from deps/MPFR/mpfr/lib/win64/libmpfr-4.lib rename to deps/MPFR/mpfr/lib/win-x64/libmpfr-4.lib diff --git a/deps/MPFR/mpfr/lib/win32/libmpfr-4.dll b/deps/MPFR/mpfr/lib/win-x86/libmpfr-4.dll similarity index 100% rename from deps/MPFR/mpfr/lib/win32/libmpfr-4.dll rename to deps/MPFR/mpfr/lib/win-x86/libmpfr-4.dll diff --git a/deps/MPFR/mpfr/lib/win32/libmpfr-4.lib b/deps/MPFR/mpfr/lib/win-x86/libmpfr-4.lib similarity index 100% rename from deps/MPFR/mpfr/lib/win32/libmpfr-4.lib rename to deps/MPFR/mpfr/lib/win-x86/libmpfr-4.lib diff --git a/deps/WebView2/lib/win64/WebView2Loader.dll b/deps/WebView2/lib/win-x64/WebView2Loader.dll similarity index 100% rename from deps/WebView2/lib/win64/WebView2Loader.dll rename to deps/WebView2/lib/win-x64/WebView2Loader.dll diff --git a/deps/WebView2/lib/win64/WebView2Loader.dll.lib b/deps/WebView2/lib/win-x64/WebView2Loader.dll.lib similarity index 100% rename from deps/WebView2/lib/win64/WebView2Loader.dll.lib rename to deps/WebView2/lib/win-x64/WebView2Loader.dll.lib diff --git a/deps/WebView2/lib/win64/WebView2LoaderStatic.lib b/deps/WebView2/lib/win-x64/WebView2LoaderStatic.lib similarity index 100% rename from deps/WebView2/lib/win64/WebView2LoaderStatic.lib rename to deps/WebView2/lib/win-x64/WebView2LoaderStatic.lib diff --git a/deps/WebView2/lib/win32/WebView2Loader.dll b/deps/WebView2/lib/win-x86/WebView2Loader.dll similarity index 100% rename from deps/WebView2/lib/win32/WebView2Loader.dll rename to deps/WebView2/lib/win-x86/WebView2Loader.dll diff --git a/deps/WebView2/lib/win32/WebView2Loader.dll.lib b/deps/WebView2/lib/win-x86/WebView2Loader.dll.lib similarity index 100% rename from deps/WebView2/lib/win32/WebView2Loader.dll.lib rename to deps/WebView2/lib/win-x86/WebView2Loader.dll.lib diff --git a/deps/WebView2/lib/win32/WebView2LoaderStatic.lib b/deps/WebView2/lib/win-x86/WebView2LoaderStatic.lib similarity index 100% rename from deps/WebView2/lib/win32/WebView2LoaderStatic.lib rename to deps/WebView2/lib/win-x86/WebView2LoaderStatic.lib diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 87268a5585..5b47c68ce1 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -27,16 +27,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) set(DEP_BOOST_TOOLSET "clang-win") endif () -if (${DEPS_BITS} EQUAL 32) - set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}") +set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}") +if ("${DEPS_ARCH}" STREQUAL "x86") set(DEP_PLATFORM "Win32") -else () - if (DEP_VS_VER LESS 16) - set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER} Win64") - else () - set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}") - endif () +elseif ("${DEPS_ARCH}" STREQUAL "x64") set(DEP_PLATFORM "x64") +else () + message(FATAL_ERROR "Unsupported OS architecture") endif () if (${DEP_DEBUG}) @@ -57,12 +54,14 @@ if (${DEP_DEBUG}) endif () endmacro() -if (${DEPS_BITS} EQUAL 32) +if ("${DEPS_ARCH}" STREQUAL "x86") set(DEP_WXWIDGETS_TARGET "") set(DEP_WXWIDGETS_LIBDIR "vc_lib") -else () +elseif ("${DEPS_ARCH}" STREQUAL "x64") set(DEP_WXWIDGETS_TARGET "TARGET_CPU=X64") set(DEP_WXWIDGETS_LIBDIR "vc_x64_lib") +else () + message(FATAL_ERROR "Unsupported OS architecture") endif () find_package(Git REQUIRED)