From 24bb4d76772e4142eca3ba01ed1902d9b56b1f10 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 24 Nov 2020 20:15:45 -0800 Subject: 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 --- scripts/get-dep-lib.sh | 3 +++ scripts/mobilecomponents.sh | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2