.gitlab-ci.yml | 20 ++++----------------
CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit a246b6f16b990b1e448265e390dc718f0c5eb927
Author: Albert Astals Cid <aa...@kde.org>
Date: Thu Mar 17 16:50:13 2022 +0100
CI: Use the qt6 provided by debian
Means increasing our minimum requirement to 6.2, but honestly if you're
on Qt6 there's no reason not to use that one.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 061c4be9..bf2acfa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >>
/etc/apt/sources.list
- apt-get update
- apt-get build-dep --yes --no-install-recommends poppler
- - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full
libbrotli-dev libboost-container-dev
+ - apt-get install --yes --no-install-recommends ninja-build
libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full
libbrotli-dev libboost-container-dev qt6-base-dev
- echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
- locale-gen
@@ -38,28 +38,20 @@ clang_format:
build:
stage: build
script:
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*icu-linux-Rhel7.2-x64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- mkdir -p build && cd build
- - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
-DCMAKE_PREFIX_PATH=$PWD/../6.1.0/gcc_64/lib/cmake
+ - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data ..
- ninja
- ctest --output-on-failure
build_clang13_libcpp:
stage: build
script:
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*icu-linux-Rhel7.2-x64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*icu-linux-Rhel7.2-x64.7z
- git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL}
test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
- apt-get install --yes --no-install-recommends libclang-13-dev
llvm-13-dev libc++-13-dev libc++abi-13-dev clang-tidy-13 clang-13
libunwind-13-dev gperf jq
- srcdir=`pwd` && mkdir -p /tmp/poppler_build && cd /tmp/poppler_build
- clang++-13 -fPIC -shared -o goostring-format-checker.so
$srcdir/test/goostring-format-checker/goostring-format-checker.cc
-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-13/include/
- - CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data
-DCMAKE_PREFIX_PATH=$srcdir/6.1.0/gcc_64/lib/cmake
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON $srcdir
+ - CC=clang-13 CXX=clang++-13 cmake -G Ninja
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang
$PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang
goostring-format-checker -Werror -Wno-deprecated-declarations"
-DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON $srcdir
- ninja
- ctest --output-on-failure
- echo "This is a complex way of not running clang-tidy over autogenerated
files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that
https://gitlab.kitware.com/cmake/cmake/-/issues/19772";
@@ -98,13 +90,9 @@ build_mingw64_fedora35:
build_clazy_clang13:
stage: build
script:
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*qtbase-Linux-CentOS_8_3-GCC-Linux-CentOS_8_3-X86_64.7z
- - wget -r -l1 -np
"https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/";
-A "6.1.0-0-*icu-linux-Rhel7.2-x64.7z"
- - 7z x
download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_610/qt.qt6.610.gcc_64/6.1.0-0-*icu-linux-Rhel7.2-x64.7z
- apt-get install --yes --no-install-recommends clazy clang-13
- mkdir -p build && cd build
- - CC=clang-13 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja .. -DCMAKE_PREFIX_PATH=$PWD/../6.1.0/gcc_64/lib/cmake
+ - CC=clang-13 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations"
cmake -G Ninja ..
-
CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static"
ninja
build_android:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76513eb6..7bec4189 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ endif()
if (ENABLE_QT6)
SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
- find_package(Qt6 6.1 COMPONENTS Core Gui Widgets Test QUIET)
+ find_package(Qt6 6.2 COMPONENTS Core Gui Widgets Test QUIET)
if (NOT (Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND
Qt6Test_FOUND))
message("-- Package Qt6Core or Qt6Gui or Qt6Widgets or Qt6Test not found")
set(ENABLE_QT6 OFF)
