From f234bdf4941f4e897c1102bd470677dd6ec5094e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 24 Feb 2022 14:12:34 +0100 Subject: [PATCH] Put the Android extra linking cmake code behind a variable The env variable check doesn't work on binary-factory for some reason so use an actual variable that will be given by Craft --- mobile/app/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/app/CMakeLists.txt b/mobile/app/CMakeLists.txt index 991ad5038..dd7e70248 100644 --- a/mobile/app/CMakeLists.txt +++ b/mobile/app/CMakeLists.txt @@ -13,8 +13,8 @@ if (ANDROID) # Unfortunately gitlab CI for now doesn't use Craft so we need # to differentiate between gitlab CI and the binary factory - if (DEFINED ENV{craftRoot}) - message("Linking in extra libraies to help androiddeployqt") + if (ANDROID_LINK_EXTRA_LIBRARIES) + message("Linking in extra libraries to help androiddeployqt") # androiddeployqt is not super smart and sometimes fails packaging # some of the libraries we only use in plugins, here we help it by linking to those "extra" libs # that are not really needed