diff options
Diffstat (limited to 'Utilities')
-rw-r--r-- | Utilities/Release/linux64_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/osx_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/win32_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/win64_release.cmake | 2 |
4 files changed, 4 insertions, 4 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 diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index a27efda..f54a4ca 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -27,6 +27,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. - set(EXTRA_CTEST_ARGS "-E Qt5Autogen") + set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'") endif() include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index e39a610..bd2690f 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -28,6 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) set(GIT_EXTRA "git config core.autocrlf true") if(CMAKE_CREATE_VERSION STREQUAL "nightly") # Some tests fail spuriously too often. - set(EXTRA_CTEST_ARGS "-E Qt5Autogen") + set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'") endif() include(${path}/release_cmake.cmake) |