Skip to content
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

Fix detection of 64-bit for Visual Studio 2019 and 2022 #25

Merged
merged 2 commits into from
Jun 13, 2023
Merged

Fix detection of 64-bit for Visual Studio 2019 and 2022 #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b3dfd4
Fix detection of 64-bit for Visual Studio 2019 and 2022
traversaro Dec 11, 2022
8f11004
Merge branch 'ros2' into patch-1
mjcarroll Jun 13, 2023
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
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ endif()
set (MMK_MANGLING "none")

if (MSVC)
if (NOT _ARCH)
# Visual Studio generator version earlier than 2017 (included) default to x86,
# after 2019 (included) it defaults to amd64
# MSVC_VERSION = 1920 corresponds to Visual Studio 2019
if (NOT CMAKE_GENERATOR_PLATFORM AND MSVC_VERSION LESS 1920)
set (_ARCH "x86")
endif ()

Expand Down