diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-26 10:49:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-26 10:50:19 (GMT) |
| commit | 71a68ece89b10189f6d872b8a075031072ed58bf (patch) | |
| tree | 5b08123914b405e493aa9cd8391a3050d646b301 | |
| parent | 5abe45270edd3403c09f279dba2c3adf388e64a6 (diff) | |
| parent | 830d4760db5a2086e8a83b0573a03bf4abe39bbe (diff) | |
| download | CMake-71a68ece89b10189f6d872b8a075031072ed58bf.zip CMake-71a68ece89b10189f6d872b8a075031072ed58bf.tar.gz CMake-71a68ece89b10189f6d872b8a075031072ed58bf.tar.bz2 | |
Merge topic 'rel-linux64'
830d4760db Utilities/Release: Build with gcc 8.2 on Linux
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2414
| -rw-r--r-- | Utilities/Release/linux64_release.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index f2ca2d5..dc34120 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -3,8 +3,8 @@ set(BOOTSTRAP_ARGS "--docdir=doc/cmake") set(HOST linux64) set(MAKE_PROGRAM "make") set(CPACK_BINARY_GENERATORS "STGZ TGZ") -set(CC /opt/gcc-6.1.0/bin/gcc) -set(CXX /opt/gcc-6.1.0/bin/g++) +set(CC /opt/gcc-8.2.0/bin/gcc) +set(CXX /opt/gcc-8.2.0/bin/g++) set(CFLAGS "") set(CXXFLAGS "") set(qt_prefix "/home/kitware/qt-5.7.0") @@ -41,6 +41,9 @@ CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3 CMAKE_PREFIX_PATH:STRING=${qt_prefix} CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=${qt_xcb_libs} ") +set(ENV [[ +export CMAKE_PREFIX_PATH=/opt/binutils-2.31 +]]) # Exclude Qt5 tests because our Qt5 is static. set(EXTRA_CTEST_ARGS "-E Qt5") |