diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:55:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:55:01 (GMT) |
| commit | 009bb0139deb32d7ab9d08f15a7364b4c37c5960 (patch) | |
| tree | 1ab00c768f08b4a1249ea5a2162a2f1cf06f4ee9 /Utilities | |
| parent | e7d3f154f001966f49add5b8b962833bb0664032 (diff) | |
| parent | 0310cb1094e198d91e99e4ffd58549c274d4d011 (diff) | |
| download | CMake-009bb0139deb32d7ab9d08f15a7364b4c37c5960.zip CMake-009bb0139deb32d7ab9d08f15a7364b4c37c5960.tar.gz CMake-009bb0139deb32d7ab9d08f15a7364b4c37c5960.tar.bz2 | |
Merge topic 'binaries-as-c++14'
0310cb10 Utilities/Release: Build Linux and OS X binaries as C++14
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/linux64_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/osx_release.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
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 |