juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace DEPS_BITS with DEPS_ARCH (#10183)

Browse Source 
* Replace DEPS_BITS with DEPS_ARCH

* Restore missing DEP_MSVC_GEN

* STREQUAL

* STREQUAL

* Other cmakelists

* webview2 rename
This commit is contained in:
Jack Boswell
2025-07-23 21:17:05 +10:00
committed by GitHub
parent 7f27c9b37b
commit c8a27715a9
19 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
deps/deps-windows.cmake vendored
View File

@@ -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)