diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2020-11-24 20:15:45 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
commit | 24bb4d76772e4142eca3ba01ed1902d9b56b1f10 (patch) | |
tree | 84fbbf63fa352c6246741c2bdff3ae2317db1c2b /scripts | |
parent | a883fce6129d053193917f2346e17f84dda3af13 (diff) | |
download | subsurface-24bb4d76772e4142eca3ba01ed1902d9b56b1f10.tar.gz |
mobile/kirigami: install our own copy of ECM
Instead of relying on this being available as a system resource, treat it
the same way as we treat Kirigami and the Breeze icons.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/get-dep-lib.sh | 3 | ||||
-rwxr-xr-x | scripts/mobilecomponents.sh | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index c81b1711a..420815a94 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -177,6 +177,9 @@ for package in "${PACKAGES[@]}" ; do kirigami) git_checkout_library kirigami $CURRENT_KIRIGAMI https://github.com/KDE/kirigami.git ;; + extra-cmake-modules) # we want this intentionally at the same version as kirigami + git_checkout_library extra-cmake-modules $CURRENT_KIRIGAMI https://github.com/KDE/extra-cmake-modules.git + ;; openssl) git_checkout_library openssl $CURRENT_OPENSSL https://github.com/openssl/openssl.git ;; diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index e295c49d8..3086b0770 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -19,7 +19,13 @@ fi # a 3rdparty folder within our sources ./scripts/get-dep-lib.sh single "$SRC"/subsurface/mobile-widgets/3rdparty kirigami ./scripts/get-dep-lib.sh single "$SRC"/subsurface/mobile-widgets/3rdparty breeze-icons +./scripts/get-dep-lib.sh single "$SRC"/subsurface/mobile-widgets/3rdparty extra-cmake-modules +# now install the ECM to keep things more contained, install into 3rdparty/ECM +mkdir -p "$SRC"/subsurface/mobile-widgets/3rdparty/ECM +cd "$SRC"/subsurface/mobile-widgets/3rdparty/ECM +cmake -DSHARE_INSTALL_DIR=.. ../extra-cmake-modules +make install exit 0 |