Handle the msgpack endianness

Author: jowr

CMakeLists.txt

@@ -257,13 +257,13 @@ list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib"
 list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
 list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
-# Set endianess for msgpack on ARM64 with MSVC
-if(MSVC)
-  if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
-    message(STATUS "Forcing msgpack-c to use little endian configuration")
-	add_compile_definitions(MSGPACK_ENDIAN_LITTLE_BYTE)
-  endif()
-endif()
+## Set endianess for msgpack on ARM64 with MSVC
+#if(MSVC)
+#  if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+#    message(STATUS "Forcing msgpack-c to use little endian configuration")
+#	add_compile_definitions(MSGPACK_ENDIAN_LITTLE_BYTE)
+#  endif()
+#endif()
 
 include_directories(${APP_INCLUDE_DIRS})
 

include/CPmsgpack.h

@@ -4,8 +4,17 @@
 #    pragma warning(disable : 4267)
 #endif
 
+// Workaround MSVC endiannes issues
+#if defined(_MSC_VER) && ( defined(_M_ARM) || defined(_M_ARM64) )
+#    define MSGPACK_ENDIAN_LITTLE_BYTE
+#endif
+
 #include "msgpack.hpp"
 
+#if defined(MSGPACK_ENDIAN_LITTLE_BYTE)
+#    undef MSGPACK_ENDIAN_LITTLE_BYTE
+#endif
+
 #ifdef _MSC_VER
 #    pragma warning(pop)
 #endif