diff options
| author | KWIML Upstream <kwrobot@kitware.com> | 2020-04-20 12:39:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-20 12:42:21 (GMT) |
| commit | bd202202ce52c400c34c5a0318422a06cd18823c (patch) | |
| tree | f2bdbca5bdf987a6621fdabbb27b0e700a8a54eb | |
| parent | 6e921648d292c81f2d0e62803f45a4f79aa892ca (diff) | |
| download | CMake-bd202202ce52c400c34c5a0318422a06cd18823c.zip CMake-bd202202ce52c400c34c5a0318422a06cd18823c.tar.gz CMake-bd202202ce52c400c34c5a0318422a06cd18823c.tar.bz2 | |
KWIML 2020-04-20 (4abfeaa7)
Code extracted from:
https://gitlab.kitware.com/utils/kwiml.git
at commit 4abfeaa780c5107013f264c0517107b48b43bba4 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
a079afc6 cmake: don't set the minimum version
Hernan Martinez (1):
4abfeaa7 abi.h: Add pointer size and endianess for Windows on ARM64
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | include/kwiml/abi.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15e65e5..1d15884 100644 --- a/CMakeLists.txt +++ b/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/include/kwiml/abi.h b/include/kwiml/abi.h index da525fd..1112cb0 100644 --- a/include/kwiml/abi.h +++ b/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 |