Changeset: b180a9c13938 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b180a9c13938
Modified Files:
CMakeLists.txt
cmake/monetdb-defines.cmake
cmake/monetdb-functions.cmake
monetdb_config.h.in
Branch: default
Log Message:
merged
diffs (47 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ include(TestBigEndian REQUIRED)
if(WIN32)
set(CMAKE_REQUIRED_LIBRARIES ws2_32.lib shell32.lib advapi32.lib)
endif()
+test_big_endian(IS_BIG_ENDIAN)
# Include MonetDB specific functions
include(monetdb-functions)
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -312,6 +312,9 @@ macro(monetdb_configure_misc)
string(TOLOWER "${CMAKE_C_COMPILER_ID}" CMAKE_C_COMPILER_ID_LOWER)
set("HOST"
"${CMAKE_SYSTEM_PROCESSOR_LOWER}-pc-${CMAKE_SYSTEM_NAME_LOWER}-${CMAKE_C_COMPILER_ID_LOWER}")
+ # Endianness
+ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+
# Password hash algorithm
set(PASSWORD_BACKEND "SHA512"
CACHE STRING
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -107,6 +107,7 @@ function(monetdb_cmake_summary)
message(STATUS "")
message(STATUS "Summary of cmake configuration of MonetDB")
message(STATUS "-----------------------------------------")
+ message(STATUS "System is big endian: ${IS_BIG_ENDIAN}")
if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
message(STATUS "NumPy include dirs: ${NUMPY_INCLUDE_DIRS}")
else()
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -238,6 +238,8 @@
#cmakedefine LENP_OR_POINTER_T @LENP_OR_POINTER_T@
#cmakedefine SIZEOF_SQLWCHAR @SIZEOF_SQLWCHAR@
+#cmakedefine WORDS_BIGENDIAN @HAVE_WORDS_BIGENDIAN@
+
/* Does your compiler support `ssize_t' type? (Posix type) */
#ifndef ssize_t
#cmakedefine ssize_t @ssize_t@
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
