diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-05 15:29:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-05 15:29:14 (GMT) |
| commit | d169b139751693f2c4e97f131b8d8cf7f4efca54 (patch) | |
| tree | 34b7597bdf8b7b08af568cff809d0bab3fd8f5d0 | |
| parent | f8751753e39763dc005d442a1dcb1f31851935cd (diff) | |
| parent | e1e54295e82ef93e9c88bccb097721f13537e16d (diff) | |
| download | CMake-d169b139751693f2c4e97f131b8d8cf7f4efca54.zip CMake-d169b139751693f2c4e97f131b8d8cf7f4efca54.tar.gz CMake-d169b139751693f2c4e97f131b8d8cf7f4efca54.tar.bz2 | |
Merge topic 'update-osx-release'
e1e54295 Utilities/Release: Compile OS X binary as C++11
| -rw-r--r-- | Utilities/Release/osx_release.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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 [[ |