Skip to content

Use upstream vs2022 support #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ifratric merged 2 commits into from
Mar 4, 2026
Merged

Use upstream vs2022 support #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e45e6c9
Use upstream vs2022 support
theKidOfArcrania Mar 3, 2026
5adc965
Remove XED_ADDITIONAL_FLAGS from command
theKidOfArcrania Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions third_party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,8 @@ else()
set(XED_HOST_CPU "")
endif()

# Attempt to fix building XED on VS2022 and later
# Because having a custom build system is just awesome :-/
if(MSVC_VERSION AND (MSVC_VERSION GREATER 1929))
get_filename_component(VS_BIN_PATH "${CMAKE_C_COMPILER}" DIRECTORY)
set(VS_LIB_EXE "${VS_BIN_PATH}/lib.exe")
set(XED_ADDITONAL_FLAGS --cc ${CMAKE_C_COMPILER} --cxx ${CMAKE_CXX_COMPILER} --linker ${CMAKE_LINKER} --ar ${VS_LIB_EXE})
else()
set(XED_ADDITONAL_FLAGS "")
endif()

set (BUILD_XED_COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU} ${XED_ADDITONAL_FLAGS}
${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/xed/mfile.py ${XED_HOST_CPU}
)

if (WIN32)
Expand Down
2 changes: 1 addition & 1 deletion third_party/mbuild
Open in desktop
Submodule mbuild updated 21 files
+48 −0 .github/workflows/ci.yml
+0 −14 .travis.yml
+5 −1 README.md
+0 −5 appveyor.yml
+51 −0 conanfile.py
+1 −2 mbuild/__init__.py
+8 −4 mbuild/base.py
+2 −2 mbuild/build_env.py
+7 −9 mbuild/dag.py
+1 −2 mbuild/dfs.py
+6 −6 mbuild/doxygen.py
+7 −8 mbuild/env.py
+184 −1 mbuild/msvs.py
+8 −3 mbuild/scanner.py
+14 −19 mbuild/util.py
+11 −12 mbuild/work_queue.py
+4 −4 setup.py
+2 −3 tests/1.py
+8 −4 tests/2.py
+10 −12 tests/3.py
+2 −3 tests/b.py