Browse Source

Merge branch 'upstream-KWIML' into update-kwiml

# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
Brad King 5 years ago
parent
commit
7bfe2924f4
2 changed files with 6 additions and 1 deletions
  1. 0 1
      Utilities/KWIML/CMakeLists.txt
  2. 6 0
      Utilities/KWIML/include/kwiml/abi.h

+ 0 - 1
Utilities/KWIML/CMakeLists.txt

@@ -17,7 +17,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
   endif()
   set(KWIML_INCLUDE_PREFIX kwiml)
 else()
-  cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
   set(kwiml_standalone 0)
   if(KWIML_INSTALL_INCLUDE_DIR AND NOT DEFINED KWIML_INCLUDE_PREFIX)
     message(FATAL_ERROR "Host project must set KWIML_INCLUDE_PREFIX")

+ 6 - 0
Utilities/KWIML/include/kwiml/abi.h

@@ -136,6 +136,8 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
 #  define KWIML_ABI_SIZEOF_DATA_PTR 8
 # elif defined(__i386) || defined(__i386__)
 #  define KWIML_ABI_SIZEOF_DATA_PTR 4
+# elif defined(_M_ARM64)
+#  define KWIML_ABI_SIZEOF_DATA_PTR 8
 # endif
 #endif
 #if !defined(KWIML_ABI_SIZEOF_DATA_PTR)
@@ -461,6 +463,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
 #  define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_BIG
 # endif
 
+/* Aarch64 (Windows) */
+#elif defined(_M_ARM64)
+# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
+
 /* Xtensa */
 #elif defined(__XTENSA_EB__)
 # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_BIG