[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-732-gd845baf

[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  d845baf36b440bcb1276585637921d2babab3ba7 (commit)
       via  ad7da08ac134dc1c7a14e028f0260860fa1d534b (commit)
      from  f23c91e0ede8de852c9d63d5ae8d878294712a79 (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=d845baf36b440bcb1276585637921d2babab3ba7
commit d845baf36b440bcb1276585637921d2babab3ba7
Merge: f23c91e ad7da08
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 6 10:50:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 6 10:50:53 2016 -0400

    Merge topic 'update-linux64-release' into next
    
    ad7da08a Utilities/Release: Switch to Qt 5.7 for Linux x86_64 binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad7da08ac134dc1c7a14e028f0260860fa1d534b
commit ad7da08ac134dc1c7a14e028f0260860fa1d534b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 14:00:30 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 6 10:47:12 2016 -0400

    Utilities/Release: Switch to Qt 5.7 for Linux x86_64 binary
    
    Compile as C++11 since Qt 5.7 requires it.  Limit use of glibc
    to 2.6 APIs and lower.

diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake
index 7511c8a..168eb86 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -2,12 +2,28 @@ set(PROCESSORS 4)
 set(BOOTSTRAP_ARGS "--docdir=doc/cmake")
 set(HOST linux64)
 set(MAKE_PROGRAM "make")
-set(CC /opt/gcc-4.9.2/bin/gcc)
-set(CXX /opt/gcc-4.9.2/bin/g++)
+set(CC /opt/gcc-6.1.0/bin/gcc)
+set(CXX /opt/gcc-6.1.0/bin/g++)
 set(CFLAGS   "")
 set(CXXFLAGS "")
+set(qt_prefix "/home/kitware/qt-5.7.0")
+set(qt_xcb_libs
+  ${qt_prefix}/plugins/platforms/libqxcb.a
+  ${qt_prefix}/lib/libQt5XcbQpa.a
+  ${qt_prefix}/lib/libQt5PlatformSupport.a
+  ${qt_prefix}/lib/libxcb-static.a
+  -lX11-xcb
+  -lX11
+  -lxcb
+  -lfontconfig
+  -lfreetype
+  )
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_C_STANDARD:STRING=11
+CMAKE_CXX_STANDARD:STRING=11
+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
 CURSES_INCLUDE_PATH:PATH=/home/kitware/ncurses-5.9/include
 FORM_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libform.a
@@ -17,9 +33,14 @@ OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2h/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libssl.a
 CPACK_SYSTEM_NAME:STRING=Linux-x86_64
 BUILD_QtDialog:BOOL:=TRUE
-CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=2.1
+CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3
 CMake_INSTALL_DEPENDENCIES:BOOL=ON
-QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-4.8.6/bin/qmake
+CMAKE_PREFIX_PATH:STRING=${qt_prefix}
+CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=${qt_xcb_libs}
 ")
+
+# Exclude Qt5 tests because our Qt5 is static.
+set(EXTRA_CTEST_ARGS "-E Qt5")
+
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)

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

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


hooks/post-receive
-- 
CMake