Skip to content

Commit 714edd4

Browse files
Fix error in Qt static directory
1 parent 860a472 commit 714edd4

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

scripts/ci_linux.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#!/bin/bash
22
build_dir="build"
3+
34
release_flags="-DCMAKE_BUILD_TYPE=Release"
4-
qt_static_dir="$build_dir/qt-static"
5-
qt_src_dir="$build_dir/qt-src"
5+
6+
qt_build_dir="qt-build"
7+
qt_static_dir="$qt_build_dir/qt-src/qtbase/build/qt-static" # qt-build/qt-static
8+
qt_src_dir="$qt_build_dir/qt-src"
9+
610
opt_flags="-O3 -march=native -flto -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ftree-vectorize -fvisibility=hidden"
711
nproc=$(nproc)
812

@@ -38,21 +42,18 @@ build_qt_static() {
3842
cmake --build . --parallel "$nproc"
3943
cmake --install . --prefix "$qt_static_dir"
4044

41-
cd ../.. | exit
45+
cd ../.. || exit
4246
}
4347

4448
build_zclipboard() {
4549
cd "$build_dir" || exit
4650

47-
export PATH="$qt_static_dir/bin:$PATH"
48-
qt_static_abs_dir=$(cd "$qt_static_dir" && pwd)
49-
5051
cmake -G "Ninja" \
5152
-DCMAKE_CXX_COMPILER=clang++ \
5253
-DCMAKE_CXX_FLAGS="$opt_flags -DFORCE_STATIC_QT" \
5354
"$release_flags" \
5455
-DCMAKE_PREFIX_PATH="$qt_static_dir" \
55-
-DQt6_DIR="$qt_static_abs_dir/lib/cmake/Qt6" \
56+
-DQt6_DIR="$qt_static_dir/lib/cmake/Qt6" \
5657
..
5758

5859
ninja -j "$nproc"

0 commit comments

Comments
 (0)