Fix cmake issues

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
 

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
     - |

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

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