Skip to content

[cmake] Fix win x64 and arm64 detection in cmake #675

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
opdenkamp merged 2 commits into from
Mar 5, 2025
+10 −6
Merged

[cmake] Fix win x64 and arm64 detection in cmake #675

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
da0497b
[cmake] CheckPlatform correctly check correct x86_64 variable
Mar 1, 2025
fcd6a21
[cmake] incorrect usage of _M_ARM64
Mar 1, 2025
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
4 changes: 3 additions & 1 deletion src/cec-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ if (NOT WIN32)
endif()
else()
add_definitions(-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_)
if ((${WIN64}) OR (${_M_ARM64}))
check_symbol_exists(_AMD64_ Windows.h WIN64)
check_symbol_exists(_ARM64_ Windows.h ARM64)
if (WIN64 OR ARM64)
string(REPLACE "/arch:SSE2" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
else()
add_definitions(-D_USE_32BIT_TIME_T)
Expand Down
4 changes: 3 additions & 1 deletion src/cecc-client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ if (NOT WIN32)
endif()
else()
add_definitions(-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_)
if ((${WIN64}) OR (${_M_ARM64}))
check_symbol_exists(_AMD64_ Windows.h WIN64)
check_symbol_exists(_ARM64_ Windows.h ARM64)
if (WIN64 OR ARM64)
string(REPLACE "/arch:SSE2" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
else()
add_definitions(-D_USE_32BIT_TIME_T)
Expand Down
2 changes: 1 addition & 1 deletion src/libcec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ if (WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcec.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/libcec.rc)
add_definitions(-DDLL_EXPORT)
add_definitions(-DTARGET_WINDOWS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_)
if ((${WIN64}) OR (${_M_ARM64}))
if (WIN64 OR ARM64)
string(REPLACE "/arch:SSE2" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
else()
add_definitions(-D_USE_32BIT_TIME_T)
Expand Down
6 changes: 3 additions & 3 deletions src/libcec/cmake/CheckPlatformSupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ if(WIN32)
# force python2 for eventghost
set(PYTHON_USE_VERSION 2)
elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "x64")
check_symbol_exists(_X64_ Windows.h WIN64)
check_symbol_exists(_AMD64_ Windows.h AMD64)
if (DEFINED WIN64 OR DEFINED AMD64)
check_symbol_exists(_AMD64_ Windows.h WIN64)
if (DEFINED WIN64)
set(LIB_INFO "${LIB_INFO} (x64)")
endif()
elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM")
set(LIB_INFO "${LIB_INFO} (arm)")
elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM64")
check_symbol_exists(_ARM64_ Windows.h ARM64)
set(LIB_INFO "${LIB_INFO} (arm64)")
else()
message(FATAL_ERROR "Unknown architecture id: ${MSVC_C_ARCHITECTURE_ID}")
Expand Down