[Cmake-commits] CMake branch, master, updated. v3.12.0-rc3-211-g0d72c50
Kitware Robot
kwrobot at kitware.com
Fri Jul 13 08:55:05 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 0d72c50d29e81789396cab9c515e90ba1e014150 (commit)
via 718d2f8f1619e6c3a2ae3bd8796ac8dbb27f36c6 (commit)
via 00afb11b072f0611cce9c6e778e4a5171182f7f7 (commit)
via 735e69f4458850cc335710af36d1382b891cbb5e (commit)
via c5a1491e900a60046a4f12c4be6ba892d675c3d2 (commit)
via c454a1435ab8d1c167908abb918a756d2f0da058 (commit)
via b76b93c728baa32c0740d36d33318a2aa394d119 (commit)
via c8a7835ea9332e3097caeda0ea297f1332948f33 (commit)
from 4d9d674cf26be9a8bbfa59927f8540b88607bb91 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d72c50d29e81789396cab9c515e90ba1e014150
commit 0d72c50d29e81789396cab9c515e90ba1e014150
Merge: 718d2f8 735e69f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 13 12:54:30 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 13 08:54:47 2018 -0400
Merge topic 'intel-std-fix'
735e69f445 Intel: Fix incorrectly documented extension flags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2206
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=718d2f8f1619e6c3a2ae3bd8796ac8dbb27f36c6
commit 718d2f8f1619e6c3a2ae3bd8796ac8dbb27f36c6
Merge: 00afb11 b76b93c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 13 12:54:09 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 13 08:54:16 2018 -0400
Merge topic 'boost-1.68-beta1'
b76b93c728 FindBoost: Change context header used
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Alexander Grund <github at grundis.de>
Merge-request: !2204
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00afb11b072f0611cce9c6e778e4a5171182f7f7
commit 00afb11b072f0611cce9c6e778e4a5171182f7f7
Merge: 4d9d674 c5a1491
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 13 12:53:16 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 13 08:53:21 2018 -0400
Merge topic 'update-kwsys'
c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys
c454a1435a KWSys 2018-07-12 (86ce4f37)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2211
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=735e69f4458850cc335710af36d1382b891cbb5e
commit 735e69f4458850cc335710af36d1382b891cbb5e
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Wed Jul 11 15:59:10 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 12 09:35:50 2018 -0400
Intel: Fix incorrectly documented extension flags
Fixes: #18166
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 3e0439f..4e4af29 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -25,8 +25,7 @@ else()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
- # todo: there is no gnu11 value supported; figure out what to do
- set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=c11")
+ set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index d9c5749..c115b6a 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -36,18 +36,21 @@ else()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0)
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
- # todo: there is no gnu++17 value supported; figure out what to do
- set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=c++17")
+ set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
- # todo: there is no gnu++14 value supported; figure out what to do
- set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++14")
elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
- # todo: there is no gnu++14 value supported; figure out what to do
- set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=c++1y")
+ endif()
+
+ # Intel 15.0.2 accepts c++14 instead of c++1y, but not gnu++14
+ # instead of gnu++1y. Intel 17.0.0 accepts gnu++14 too.
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.0)
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0)
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5a1491e900a60046a4f12c4be6ba892d675c3d2
commit c5a1491e900a60046a4f12c4be6ba892d675c3d2
Merge: 05cd831 c454a14
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 12 08:47:15 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 12 08:47:15 2018 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-07-12 (86ce4f37)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c454a1435ab8d1c167908abb918a756d2f0da058
commit c454a1435ab8d1c167908abb918a756d2f0da058
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Thu Jul 12 07:43:48 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 12 08:47:14 2018 -0400
KWSys 2018-07-12 (86ce4f37)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 86ce4f37437685728662ab6edcf8cf7b6154d649 (master).
Upstream Shortlog
-----------------
Devin Nakamura (1):
2cbf13d2 Terminal: Add support for z/OS terminal
diff --git a/Terminal.c b/Terminal.c
index f0d9c64..1bcfd0c 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -209,27 +209,34 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
}
/* VT100 escape sequence strings. */
-#define KWSYS_TERMINAL_VT100_NORMAL "\33[0m"
-#define KWSYS_TERMINAL_VT100_BOLD "\33[1m"
-#define KWSYS_TERMINAL_VT100_UNDERLINE "\33[4m"
-#define KWSYS_TERMINAL_VT100_BLINK "\33[5m"
-#define KWSYS_TERMINAL_VT100_INVERSE "\33[7m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_BLACK "\33[30m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_RED "\33[31m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_GREEN "\33[32m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_YELLOW "\33[33m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_BLUE "\33[34m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_MAGENTA "\33[35m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_CYAN "\33[36m"
-#define KWSYS_TERMINAL_VT100_FOREGROUND_WHITE "\33[37m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_BLACK "\33[40m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_RED "\33[41m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_GREEN "\33[42m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_YELLOW "\33[43m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_BLUE "\33[44m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_MAGENTA "\33[45m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_CYAN "\33[46m"
-#define KWSYS_TERMINAL_VT100_BACKGROUND_WHITE "\33[47m"
+#if defined(__MVS__)
+/* if building on z/OS (aka MVS), assume we are using EBCDIC */
+# define ESCAPE_CHAR "\47"
+#else
+# define ESCAPE_CHAR "\33"
+#endif
+
+#define KWSYS_TERMINAL_VT100_NORMAL ESCAPE_CHAR "[0m"
+#define KWSYS_TERMINAL_VT100_BOLD ESCAPE_CHAR "[1m"
+#define KWSYS_TERMINAL_VT100_UNDERLINE ESCAPE_CHAR "[4m"
+#define KWSYS_TERMINAL_VT100_BLINK ESCAPE_CHAR "[5m"
+#define KWSYS_TERMINAL_VT100_INVERSE ESCAPE_CHAR "[7m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_BLACK ESCAPE_CHAR "[30m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_RED ESCAPE_CHAR "[31m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_GREEN ESCAPE_CHAR "[32m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_YELLOW ESCAPE_CHAR "[33m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_BLUE ESCAPE_CHAR "[34m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_MAGENTA ESCAPE_CHAR "[35m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_CYAN ESCAPE_CHAR "[36m"
+#define KWSYS_TERMINAL_VT100_FOREGROUND_WHITE ESCAPE_CHAR "[37m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_BLACK ESCAPE_CHAR "[40m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_RED ESCAPE_CHAR "[41m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_GREEN ESCAPE_CHAR "[42m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_YELLOW ESCAPE_CHAR "[43m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_BLUE ESCAPE_CHAR "[44m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_MAGENTA ESCAPE_CHAR "[45m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_CYAN ESCAPE_CHAR "[46m"
+#define KWSYS_TERMINAL_VT100_BACKGROUND_WHITE ESCAPE_CHAR "[47m"
/* Write VT100 escape sequences to the stream for the given color. */
static void kwsysTerminalSetVT100Color(FILE* stream, int color)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b76b93c728baa32c0740d36d33318a2aa394d119
commit b76b93c728baa32c0740d36d33318a2aa394d119
Author: Roger Leigh <rleigh at codelibre.net>
AuthorDate: Wed Jul 11 23:14:19 2018 +0100
Commit: Roger Leigh <rleigh at codelibre.net>
CommitDate: Wed Jul 11 23:14:21 2018 +0100
FindBoost: Change context header used
boost/context/all.hpp is removed in Boost 1.68.
boost/context/detail/fcontext.hpp is present in all Boost
releases containing context (≥1.61).
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 9a1301f..4e5c45d 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -881,7 +881,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_CHRONO_HEADERS "boost/chrono.hpp")
set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
set(_Boost_CONTRACT_HEADERS "boost/contract.hpp")
- set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
+ set(_Boost_CONTEXT_HEADERS "boost/context/detail/fcontext.hpp")
set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp")
set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp")
set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a7835ea9332e3097caeda0ea297f1332948f33
commit c8a7835ea9332e3097caeda0ea297f1332948f33
Author: Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jul 10 21:07:27 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 11 07:26:51 2018 -0400
FindBoost: Add support for Boost 1.68 beta1
This includes a new component, `Boost::contract`.
Fixes: #18167
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 08d9762..9a1301f 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -806,10 +806,28 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_TIMER_DEPENDENCIES chrono system)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+ elseif(NOT Boost_VERSION VERSION_LESS 106700 AND Boost_VERSION VERSION_LESS 106800)
+ set(_Boost_CHRONO_DEPENDENCIES system)
+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+ set(_Boost_COROUTINE_DEPENDENCIES context system)
+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+ set(_Boost_FILESYSTEM_DEPENDENCIES system)
+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
+ set(_Boost_MPI_DEPENDENCIES serialization)
+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
+ set(_Boost_RANDOM_DEPENDENCIES system)
+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+ set(_Boost_TIMER_DEPENDENCIES chrono system)
+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
else()
- if(NOT Boost_VERSION VERSION_LESS 106700)
+ if(NOT Boost_VERSION VERSION_LESS 106800)
set(_Boost_CHRONO_DEPENDENCIES system)
set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono system date_time)
set(_Boost_COROUTINE_DEPENDENCIES context system)
set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
set(_Boost_FILESYSTEM_DEPENDENCIES system)
@@ -825,7 +843,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
endif()
- if(NOT Boost_VERSION VERSION_LESS 106800)
+ if(NOT Boost_VERSION VERSION_LESS 106900)
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
endif()
endif()
@@ -862,6 +880,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_ATOMIC_HEADERS "boost/atomic.hpp")
set(_Boost_CHRONO_HEADERS "boost/chrono.hpp")
set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
+ set(_Boost_CONTRACT_HEADERS "boost/contract.hpp")
set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp")
set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp")
@@ -1062,7 +1081,7 @@ else()
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
# _Boost_COMPONENT_DEPENDENCIES.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
+ "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
"1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Intel-C.cmake | 3 +--
Modules/Compiler/Intel-CXX.cmake | 15 +++++++-----
Modules/FindBoost.cmake | 27 ++++++++++++++++++----
Source/kwsys/Terminal.c | 49 +++++++++++++++++++++++-----------------
4 files changed, 61 insertions(+), 33 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list