From f1c776ccadc8ac0c2ccb0131fe446ac8fd32c9e8 Mon Sep 17 00:00:00 2001 From: Andrew Wason Date: Sun, 14 Jan 2024 11:12:08 -0500 Subject: [PATCH] sudo install. tweak iwyu --- builders/Linux/iwyu.sh | 6 +++--- builders/mediafx-build.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builders/Linux/iwyu.sh b/builders/Linux/iwyu.sh index f282eda..6a18fd4 100755 --- a/builders/Linux/iwyu.sh +++ b/builders/Linux/iwyu.sh @@ -4,10 +4,10 @@ set -e -sudo mkdir -p /mediafx/build/Linux && sudo chown mediafx /mediafx/build/ /mediafx/build/Linux +sudo mkdir -p /mediafx/build/Linux cd /mediafx/build/Linux if [ ! -f "qt${QT_VER}.imp" ]; then curl -O https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/clang_13/mapgen/iwyu-mapgen-qt.py - python3 iwyu-mapgen-qt.py /usr/local/Qt/${QT_VER}/gcc_64/include > qt${QT_VER}.imp + python3 iwyu-mapgen-qt.py ${QTDIR}/include > qt${QT_VER}.imp fi -CC="clang-13" CXX="clang++-13" cmake -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="/usr/bin/iwyu;-Xiwyu;--mapping_file=/mediafx/build/Linux/qt${QT_VER}.imp;-Xiwyu;--cxx17ns;-Xiwyu;--no_comments" --install-prefix /usr/local/Qt/${QT_VER}/gcc_64 ../.. && exec cmake --build . --parallel 4 +CC="clang-13" CXX="clang++-13" cmake -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="/usr/bin/iwyu;-Xiwyu;--mapping_file=/mediafx/build/Linux/qt${QT_VER}.imp;-Xiwyu;--cxx17ns;-Xiwyu;--no_comments" --install-prefix ${QTDIR} ../.. && exec cmake --build . --parallel 4 diff --git a/builders/mediafx-build.sh b/builders/mediafx-build.sh index 11d47b1..09061ef 100755 --- a/builders/mediafx-build.sh +++ b/builders/mediafx-build.sh @@ -9,7 +9,7 @@ BUILD_TYPE=${BUILD_TYPE:-Release} MEDIAFX_BUILD="${BUILD_ROOT}/${BUILD_TYPE}" mkdir -p "$MEDIAFX_BUILD" cd "$MEDIAFX_BUILD" -(cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE --install-prefix "${QTDIR}" ../../.. && cmake --build . && cmake --install .) || exit 1 +(cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE --install-prefix "${QTDIR}" ../../.. && cmake --build . && sudo cmake --install .) || exit 1 if [[ -v MEDIAFX_TEST ]]; then make test CTEST_OUTPUT_ON_FAILURE=1 ARGS="${MEDIAFX_TEST}" || exit 1 fi \ No newline at end of file