Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream-KWIML' into update-kwiml

Browse Source 
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2020-04-20 (4abfeaa7)
This commit is contained in:
Brad King
2020-04-20 08:42:21 -04:00
parent 5d32699975 bd202202ce
commit 7bfe2924f4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Utilities/KWIML/CMakeLists.txt
View File

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

6
Utilities/KWIML/include/kwiml/abi.h
View File

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