diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-20 12:42:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-20 12:42:21 (GMT) |
| commit | 7bfe2924f4bc423bb25d2eb23dde213cfdbb0d93 (patch) | |
| tree | b210d845597f3ba804b87f435cdb6be1b5a45341 | |
| parent | 5d32699975d8623c19f74c75f22ee128a81508c8 (diff) | |
| parent | bd202202ce52c400c34c5a0318422a06cd18823c (diff) | |
| download | CMake-7bfe2924f4bc423bb25d2eb23dde213cfdbb0d93.zip CMake-7bfe2924f4bc423bb25d2eb23dde213cfdbb0d93.tar.gz CMake-7bfe2924f4bc423bb25d2eb23dde213cfdbb0d93.tar.bz2 | |
Merge branch 'upstream-KWIML' into update-kwiml
# By KWIML Upstream
* upstream-KWIML:
KWIML 2020-04-20 (4abfeaa7)
| -rw-r--r-- | Utilities/KWIML/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Utilities/KWIML/include/kwiml/abi.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Utilities/KWIML/CMakeLists.txt b/Utilities/KWIML/CMakeLists.txt index 15e65e5..1d15884 100644 --- a/Utilities/KWIML/CMakeLists.txt +++ b/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") diff --git a/Utilities/KWIML/include/kwiml/abi.h b/Utilities/KWIML/include/kwiml/abi.h index da525fd..1112cb0 100644 --- a/Utilities/KWIML/include/kwiml/abi.h +++ b/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 |