[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-651-g4856cde

[Brad King]

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  4856cde243efc07419d7027497457a858f2b5d4f (commit)
       via  e1e54295e82ef93e9c88bccb097721f13537e16d (commit)
      from  a1695a8cbfd24765b7d372aaabcff6a38869012a (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=4856cde243efc07419d7027497457a858f2b5d4f
commit 4856cde243efc07419d7027497457a858f2b5d4f
Merge: a1695a8 e1e5429
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 1 11:26:45 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 1 11:26:45 2016 -0400

    Merge topic 'update-osx-release' into next
    
    e1e54295 Utilities/Release: Compile OS X binary as C++11


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1e54295e82ef93e9c88bccb097721f13537e16d
commit e1e54295e82ef93e9c88bccb097721f13537e16d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 1 11:16:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 1 11:17:09 2016 -0400

    Utilities/Release: Compile OS X binary as C++11
    
    We already compile with `-stdlib=libc++` as required for Qt 5.6.
    We can compile as C++11 and still deploy to OS X 10.7.

diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake
index 35705ed..e7e5ba4 100644
--- a/Utilities/Release/osx_release.cmake
+++ b/Utilities/Release/osx_release.cmake
@@ -13,6 +13,8 @@ set(CFLAGS   "")
 set(CXXFLAGS "-stdlib=libc++")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_C_STANDARD:STRING=11
+CMAKE_CXX_STANDARD:STRING=11
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
@@ -21,8 +23,6 @@ BUILD_QtDialog:BOOL=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3
 CMake_INSTALL_DEPENDENCIES:BOOL=ON
 CMAKE_SKIP_RPATH:BOOL=TRUE
-CMake_NO_C_STANDARD:BOOL=TRUE
-CMake_NO_CXX_STANDARD:BOOL=TRUE
 CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE
 ")
 set(ENV [[

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/osx_release.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake