summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2022-06-03 10:41:27 (GMT)
committerBrad King <brad.king@kitware.com>2022-06-03 10:47:55 (GMT)
commit6b88084658c3a751072c3e0f7d70bca3fb234bc5 (patch)
treee3799f05571f7d1c76da07111de54fd31156b812
parent9deb2d60137200773a68bee933f677809646df69 (diff)
downloadCMake-6b88084658c3a751072c3e0f7d70bca3fb234bc5.zip
CMake-6b88084658c3a751072c3e0f7d70bca3fb234bc5.tar.gz
CMake-6b88084658c3a751072c3e0f7d70bca3fb234bc5.tar.bz2
KWSys 2022-06-03 (c28e27bc)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c28e27bc4ad8e12d88b05f30eec19b2987c60721 (master). Upstream Shortlog ----------------- Brad King (3): 591c4efb Activate POSIX APIs even without compiler extensions 45f20b83 Fix XL/XLClang warning suppression under CMP0089 NEW behavior 257b1111 Configure with policies through CMake 3.22
-rw-r--r--CMakeLists.txt14
-rw-r--r--ProcessUNIX.c4
-rw-r--r--Terminal.c4
-rw-r--r--testProcess.c4
-rw-r--r--testSharedForward.c.in4
5 files changed, 18 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2253a83..af02f7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,17 +88,7 @@
# any outside mailing list and no documentation of the change will be
# written.
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-foreach(p
- CMP0056 # CMake 3.2, Honor link flags in try_compile() source-file signature.
- CMP0063 # CMake 3.3, Honor visibility properties for all target types.
- CMP0067 # CMake 3.8, Honor language standard in try_compile source-file signature.
- CMP0069 # CMake 3.9, INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
- )
- if(POLICY ${p})
- cmake_policy(SET ${p} NEW)
- endif()
-endforeach()
+cmake_minimum_required(VERSION 3.9...3.22 FATAL_ERROR)
# Some configure checks depend upon the deployment target. Clear checks when
# the deployment target changes.
@@ -1111,7 +1101,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
# Some Apple compilers produce bad optimizations in this source.
if(APPLE AND CMAKE_C_COMPILER_ID MATCHES "^(GNU|LLVM)$")
set(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -O0")
- elseif(CMAKE_C_COMPILER_ID STREQUAL "XL")
+ elseif(CMAKE_C_COMPILER_ID MATCHES "^(XL|XLClang)$")
# Tell IBM XL not to warn about our test infinite loop
if(CMAKE_SYSTEM MATCHES "Linux.*ppc64le"
AND CMAKE_C_COMPILER_VERSION VERSION_LESS "16.1.0"
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 22cbf06..45a9e6f 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -1,5 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing#kwsys for details. */
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
+/* NOLINTNEXTLINE(bugprone-reserved-identifier) */
+# define _XOPEN_SOURCE 600
+#endif
#include "kwsysPrivate.h"
#include KWSYS_HEADER(Process.h)
#include KWSYS_HEADER(System.h)
diff --git a/Terminal.c b/Terminal.c
index 20bb5fe..39081a7 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -1,5 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing#kwsys for details. */
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
+/* NOLINTNEXTLINE(bugprone-reserved-identifier) */
+# define _XOPEN_SOURCE 600
+#endif
#include "kwsysPrivate.h"
#include KWSYS_HEADER(Terminal.h)
diff --git a/testProcess.c b/testProcess.c
index eed770c..fcc31da 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -1,5 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing#kwsys for details. */
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
+/* NOLINTNEXTLINE(bugprone-reserved-identifier) */
+# define _XOPEN_SOURCE 600
+#endif
#include "kwsysPrivate.h"
#include KWSYS_HEADER(Process.h)
#include KWSYS_HEADER(Encoding.h)
diff --git a/testSharedForward.c.in b/testSharedForward.c.in
index b3eb413..e909458 100644
--- a/testSharedForward.c.in
+++ b/testSharedForward.c.in
@@ -1,5 +1,9 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing#kwsys for details. */
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
+/* NOLINTNEXTLINE(bugprone-reserved-identifier) */
+# define _XOPEN_SOURCE 600
+#endif
#if defined(CMAKE_INTDIR)
# define CONFIG_DIR_PRE CMAKE_INTDIR "/"
# define CONFIG_DIR_POST "/" CMAKE_INTDIR