summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-09-25 18:04:10 (GMT)
committerBrad King <brad.king@kitware.com>2018-09-25 20:53:11 (GMT)
commit830d4760db5a2086e8a83b0573a03bf4abe39bbe (patch)
treef44cba11a110e86d1fe66c28b18cf607da411f77 /Utilities
parent55a5b56e083c4c2d4e768212422991a22569ecb4 (diff)
downloadCMake-830d4760db5a2086e8a83b0573a03bf4abe39bbe.zip
CMake-830d4760db5a2086e8a83b0573a03bf4abe39bbe.tar.gz
CMake-830d4760db5a2086e8a83b0573a03bf4abe39bbe.tar.bz2
Utilities/Release: Build with gcc 8.2 on Linux
Also add a binutils-2.31 to CMAKE_PREFIX_PATH in the environment so that tests that look for them with `find_program` can find a newer version. This is needed for the build id support in readelf.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/Release/linux64_release.cmake7
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")