From 53ade2c50d3088c0f504bb4f8303fe616b4c8668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Wed, 27 Nov 2024 07:45:58 +0000
Subject: [PATCH] Fix cmake issues
---
cicd/gitlab-ci.yml | 2 +-
cicd/stages/test.yml | 1 +
src/CMakeLists.txt | 6 ++----
tests/CMakeLists.txt | 2 ++
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml
index d7c2153..6538c75 100644
--- a/cicd/gitlab-ci.yml
+++ b/cicd/gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
QDS_CI_QT_VERSION: "6.8.0"
QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts"
QDS_CI_ANDROID_SDK_VERSION: "34.0.0"
- QDS_CI_SKIP_TESTS: "true"
+ QDS_CI_SKIP_TESTS: "false"
DEBIAN_FRONTEND: non-interactive
GIT_SUBMODULE_STRATEGY: recursive
diff --git a/cicd/stages/test.yml b/cicd/stages/test.yml
index b6f63a4..6eb7339 100644
--- a/cicd/stages/test.yml
+++ b/cicd/stages/test.yml
@@ -27,6 +27,7 @@ test-x86_64:
- cd ${QDS_CI_ARTIFACTS_PATH}/x86_64/test || exit 1
- mkdir -p ${QDS_CI_JOB_TEST_RESULTS_PATH}
- adb install -r -g android-build-release.apk
+ - adb shell pm clear io.qt.qtdesignviewer.test
- adb shell "run-as io.qt.qtdesignviewer.test rm -rf /data/data/io.qt.qtdesignviewer.test/files/output.junitxml"
- adb shell am start -e applicationArguments "'-o output.junitxml,junitxml'" -n io.qt.qtdesignviewer.test/org.qtproject.qt.android.bindings.QtActivity
- |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21e6ee6..cf9b341 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,13 +76,11 @@ target_include_directories(qtuiviewerlib PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
-set_property(TARGET qtuiviewerlib
- APPEND PROPERTY QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer"
-)
-
set_target_properties(${PROJECT_NAME} PROPERTIES QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer")
set_property(TARGET ${PROJECT_NAME}
APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android
+)
+set_property(TARGET ${PROJECT_NAME}
APPEND PROPERTY QT_ANDROID_EXTRA_LIBS
${ANDROID_OPENSSL_PATH}/libcrypto_3.so
${ANDROID_OPENSSL_PATH}/libssl_3.so
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index af81f22..5c840f4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,6 +19,8 @@ target_link_libraries(
set_target_properties(${TARGET_NAME} PROPERTIES QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer.test")
set_property(TARGET ${TARGET_NAME}
APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android
+)
+set_property(TARGET ${TARGET_NAME}
APPEND PROPERTY QT_ANDROID_EXTRA_LIBS
${ANDROID_OPENSSL_PATH}/libcrypto_3.so
${ANDROID_OPENSSL_PATH}/libssl_3.so
--
GitLab