Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Commits
b7f432d2
Commit
b7f432d2
authored
1 year ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
OpenSSL path was incorrect
parent
b006fa2f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!4
OpenSSL path was incorrect
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
cicd/gitlab/stages/build.yml
+12
-7
12 additions, 7 deletions
cicd/gitlab/stages/build.yml
with
14 additions
and
9 deletions
CMakeLists.txt
+
2
−
2
View file @
b7f432d2
...
...
@@ -56,8 +56,8 @@ if (ANDROID)
set_property
(
TARGET
${
PROJECT_NAME
}
PROPERTY QT_ANDROID_EXTRA_LIBS
${
ANDROID_OPENSSL_PATH
}
/libcrypto_3.so
${
ANDROID_OPENSSL_PATH
}
/libssl_3.so
)
else
()
message
(
WARNING
"Cannot find OpenSSL for Android."
)
else
()
message
(
WARNING
"Cannot find OpenSSL for Android.
Path:
${
ANDROID_OPENSSL_PATH
}
"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
cicd/gitlab/stages/build.yml
+
12
−
7
View file @
b7f432d2
...
...
@@ -24,13 +24,18 @@ build-android-multiarch:
-
if
:
$QDS_CI_QT_VERSION_ANDROID != "none"
parallel
:
matrix
:
-
QDS_CI_JOB_TARGET_ARCH
:
-
"
arm64_v8a"
-
"
armv7"
-
"
x86"
-
"
x86_64"
-
QDS_CI_JOB_TARGET_ARCH
:
"
arm64_v8a"
QDS_CI_JOB_OPENSSL_PATH
:
"
/opt/openssl/ssl_3/arm64-v8a"
-
QDS_CI_JOB_TARGET_ARCH
:
"
armv7"
QDS_CI_JOB_OPENSSL_PATH
:
"
/opt/openssl/ssl_3/armeabi-v7a"
-
QDS_CI_JOB_TARGET_ARCH
:
"
x86"
QDS_CI_JOB_OPENSSL_PATH
:
"
/opt/openssl/ssl_3/x86"
-
QDS_CI_JOB_TARGET_ARCH
:
"
x86_64"
QDS_CI_JOB_OPENSSL_PATH
:
"
/opt/openssl/ssl_3/x86_64"
script
:
-
cd qtquickdesigner-components
-
ls -l /opt/openssl/ssl_3/
-
ls -l ${QDS_CI_JOB_OPENSSL_PATH}
-
|
cmake \
-S . \
...
...
@@ -41,7 +46,7 @@ build-android-multiarch:
-DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \
-DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
-DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \
-DANDROID_OPENSSL_PATH=
/opt/openssl/ssl_3/
${QDS_CI_JOB_
TARGET_ARC
H}
-DANDROID_OPENSSL_PATH=${QDS_CI_JOB_
OPENSSL_PAT
H}
-
cmake --build .
-
cmake --install .
-
cd ..
...
...
@@ -56,7 +61,7 @@ build-android-multiarch:
-DANDROID_NDK_ROOT=/opt/android/ndk/25.2.9519653 \
-DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
-DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH} \
-DANDROID_OPENSSL_PATH=
/opt/openssl/ssl_3/
${QDS_CI_JOB_
TARGET_ARC
H}
-DANDROID_OPENSSL_PATH=${QDS_CI_JOB_
OPENSSL_PAT
H}
-
cmake --build ${QDS_BUILD_PATH} --target all
-
cp -r ${QDS_BUILD_PATH}/android-build/build/outputs/apk/debug/* ${QDS_CI_JOB_ARTIFACTS_PATH}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment