[Cmake-commits] CMake branch, next, updated. v3.6.2-2123-gb9ddf98
Brad King
brad.king at kitware.com
Fri Sep 16 12:53:13 EDT 2016
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, next has been updated
via b9ddf9801cb6b481ed076aa63b7dc8e619633115 (commit)
via 0310cb1094e198d91e99e4ffd58549c274d4d011 (commit)
from a6b04580f92ba926fac8b8feb401413824ee82d2 (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=b9ddf9801cb6b481ed076aa63b7dc8e619633115
commit b9ddf9801cb6b481ed076aa63b7dc8e619633115
Merge: a6b0458 0310cb1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 12:53:11 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 12:53:11 2016 -0400
Merge topic 'binaries-as-c++14' into next
0310cb10 Utilities/Release: Build Linux and OS X binaries as C++14
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0310cb1094e198d91e99e4ffd58549c274d4d011
commit 0310cb1094e198d91e99e4ffd58549c274d4d011
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 12:52:13 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 12:52:13 2016 -0400
Utilities/Release: Build Linux and OS X binaries as C++14
The toolchains we use to build on these platforms support it.
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index 168eb86..e7e154e 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -21,7 +21,7 @@ set(qt_xcb_libs
set(INITIAL_CACHE "
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_C_STANDARD:STRING=11
-CMAKE_CXX_STANDARD:STRING=11
+CMAKE_CXX_STANDARD:STRING=14
CMAKE_C_FLAGS:STRING=-D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1
CMAKE_EXE_LINKER_FLAGS:STRING=-static-libstdc++ -static-libgcc
CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a
diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake
index e7e5ba4..12b12d7 100644
--- a/Utilities/Release/osx_release.cmake
+++ b/Utilities/Release/osx_release.cmake
@@ -14,7 +14,7 @@ set(CXXFLAGS "-stdlib=libc++")
set(INITIAL_CACHE "
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_C_STANDARD:STRING=11
-CMAKE_CXX_STANDARD:STRING=11
+CMAKE_CXX_STANDARD:STRING=14
CMAKE_OSX_ARCHITECTURES:STRING=x86_64
CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/linux64_release.cmake | 2 +-
Utilities/Release/osx_release.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list