diff options
author | Brad King <brad.king@kitware.com> | 2022-06-06 13:46:20 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-06 13:46:34 (GMT) |
commit | 9fdade1d6b1f62cbb24e0bdf79b98d72145ba17f (patch) | |
tree | 3ab60ed041b043d40b7d605ae1f15390cfee575a | |
parent | efe918fdbaded70c7d63f5503948b2ab2a3e8e33 (diff) | |
parent | c7c3e39e4faa6fe4f6868b8bf83ee20bda5a5faf (diff) | |
download | CMake-9fdade1d6b1f62cbb24e0bdf79b98d72145ba17f.zip CMake-9fdade1d6b1f62cbb24e0bdf79b98d72145ba17f.tar.gz CMake-9fdade1d6b1f62cbb24e0bdf79b98d72145ba17f.tar.bz2 |
Merge topic 'c-no-extensions'
c7c3e39e4f Utilities: Activate POSIX APIs even without compiler extensions
3ba324b6b6 libarchive: Remove a system preprocessor macro that conflicts with a local var
4a283fcc31 librhash: Explicitly enable large file support on 32-bit targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7320
-rw-r--r-- | Utilities/cmbzip2/CMakeLists.txt | 8 | ||||
-rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 14 | ||||
-rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 10 | ||||
-rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c | 3 | ||||
-rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 8 | ||||
-rw-r--r-- | Utilities/cmlibrhash/librhash/rhash.c | 1 |
6 files changed, 44 insertions, 0 deletions
diff --git a/Utilities/cmbzip2/CMakeLists.txt b/Utilities/cmbzip2/CMakeLists.txt index 52efe14..1d7b265 100644 --- a/Utilities/cmbzip2/CMakeLists.txt +++ b/Utilities/cmbzip2/CMakeLists.txt @@ -8,6 +8,14 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") endif() +# Activate POSIX APIs. +if(CMAKE_SYSTEM_NAME MATCHES "^(AIX|OS400)$") + add_definitions(-D_ALL_SOURCE) +endif() +if(NOT CMAKE_SYSTEM_NAME MATCHES "BSD|Darwin|Windows") + add_definitions(-D_XOPEN_SOURCE=600) +endif() + add_definitions(-D_FILE_OFFSET_BITS=64) add_library(cmbzip2 blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 2c0e873..f842270 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -119,6 +119,20 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") endif() +# Activate POSIX APIs. +if(CMAKE_SYSTEM_NAME MATCHES "^(AIX|OS400)$") + add_definitions(-D_ALL_SOURCE) +endif() +if(CMAKE_SYSTEM_NAME MATCHES "^(Linux)$") + add_definitions(-D_DEFAULT_SOURCE -D_BSD_SOURCE) +endif() +if(CMAKE_SYSTEM_NAME MATCHES "^(SunOS)$") + add_definitions(-D__EXTENSIONS__) +endif() +if(NOT CMAKE_SYSTEM_NAME MATCHES "BSD|Darwin|Windows") + add_definitions(-D_XOPEN_SOURCE=600) +endif() + #*************************************************************************** # _ _ ____ _ # Project ___| | | | _ \| | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 9ab7cec..eea472f 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -103,6 +103,16 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") ENDIF() +# Activate POSIX APIs. +if(CMAKE_SYSTEM_NAME MATCHES "^(Linux)$") + add_definitions(-D_DEFAULT_SOURCE -D_BSD_SOURCE) + string(APPEND CMAKE_REQUIRED_DEFINITIONS " -D_DEFAULT_SOURCE -D_BSD_SOURCE") +endif() +if(NOT CMAKE_SYSTEM_NAME MATCHES "BSD|Darwin|Windows") + add_definitions(-D_XOPEN_SOURCE=600) + string(APPEND CMAKE_REQUIRED_DEFINITIONS " -D_XOPEN_SOURCE=600") +endif() + IF(0) # CMake does not need flags specific to libarchive upstream development. if (CMAKE_BUILD_TYPE STREQUAL "Debug") OPTION(ENABLE_WERROR "Treat warnings as errors - default is ON for Debug, OFF otherwise." ON) diff --git a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c index b913a4d..4f9b2d9 100644 --- a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c +++ b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c @@ -28,6 +28,9 @@ #define PARALLELISM_DEGREE 8 +/* Remove system-defined preprocessor defintions that conflict with us. */ +#undef FS + /* blake2sp_init_param defaults to setting the expecting output length from the digest_length parameter block field. diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index 0de1e97..3121fbe 100644 --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt @@ -166,6 +166,14 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") ENDIF() +# Activate POSIX APIs. +if(CMAKE_SYSTEM_NAME MATCHES "^(AIX|OS400)$") + add_definitions(-D_ALL_SOURCE) +endif() +if(NOT CMAKE_SYSTEM_NAME MATCHES "BSD|Darwin|Windows") + add_definitions(-D_XOPEN_SOURCE=600) +endif() + ADD_LIBRARY(cmliblzma STATIC ${LZMA_SRCS}) IF(CMAKE_C_COMPILER_ID STREQUAL "XL") diff --git a/Utilities/cmlibrhash/librhash/rhash.c b/Utilities/cmlibrhash/librhash/rhash.c index ce6ace4..2530112 100644 --- a/Utilities/cmlibrhash/librhash/rhash.c +++ b/Utilities/cmlibrhash/librhash/rhash.c @@ -20,6 +20,7 @@ #endif /* macros for large file support, must be defined before any include file */ +#define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE #define _FILE_OFFSET_BITS 64 |