Skip to content

Commit 7203552

Browse files
committed
Checking for ARM64 on Windows
1 parent 76daa5a commit 7203552

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/workflows/python_cibuildwheel.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
CIBW_ENVIRONMENT_LINUX: COOLPROP_CMAKE=default,NATIVE
5959
CIBW_BUILD: cp${{ matrix.python-version }}-*
6060
CIBW_ARCHS_MACOS: x86_64 arm64 # universal2 is redundant
61-
CIBW_ARCHS_WINDOWS: AMD64 x86 # ARM64 does not build properly due to msgpack-c (MSVC error C1189)
61+
CIBW_ARCHS_WINDOWS: AMD64 x86 ARM64
6262
CIBW_ARCHS_LINUX: x86_64 aarch64 ppc64le s390x
6363
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
6464
CIBW_MANYLINUX_I686_IMAGE: manylinux2014

CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,14 @@ list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib"
257257
list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
258258
list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
259259

260+
# Set endianess for msgpack on ARM64 with MSVC
261+
if(MSVC)
262+
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
263+
message(STATUS "Forcing msgpack-c to use little endian configuration")
264+
add_compile_definitions(MSGPACK_ENDIAN_LITTLE_BYTE)
265+
endif()
266+
endif()
267+
260268
include_directories(${APP_INCLUDE_DIRS})
261269

262270
set(SWIG_DEPENDENCIES

0 commit comments

Comments
 (0)