Skip to content

Commit 7edd933

Browse files
committed
Merge CI compatibility repairs from #1429
Carry the SQLite target adapter and Android SDK setup correction into #1520 so inherited failures from current main do not obscure PR validation. Files changed: - .github/workflows/build-android.yml - .github/workflows/codeql-analysis.yml - cmake/MSTelemetryConfig.cmake.in - cmake/MatsdkDependencyTargets.cmake Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: c4cfcad8-1637-4e46-86cf-6bf200244b04
2 parents 300d381 + 74b1632 commit 7edd933

4 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎.github/workflows/build-android.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
java-version: '17'
5151
- name: Setup Android SDK
5252
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
53+
with:
54+
packages: platform-tools
5355
- name: Install NDK
5456
run: |
5557
java -version

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ jobs:
132132
java-version: '17'
133133
- name: Setup Android SDK
134134
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
135+
with:
136+
packages: platform-tools
135137
- name: Install NDK
136138
run: |
137139
java -version

‎cmake/MSTelemetryConfig.cmake.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ if(@MATSDK_CONFIG_STATIC_PACKAGE@)
1717
SQLite3::SQLite3
1818
"@MATSDK_SQLITE_PROVIDER_RESOLVED@"
1919
SQLite3
20+
LEGACY_TARGET SQLite::SQLite3
2021
${_matsdk_package_sqlite_args})
2122
matsdk_add_package_system_dependency(
2223
MSTelemetry::zlib_dependency

‎cmake/MatsdkDependencyTargets.cmake‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function(matsdk_add_package_system_dependency dependency_target canonical_target
2020
endif()
2121

2222
set(options APPLE_SYSTEM)
23-
set(one_value_args APPLE_LIBRARY)
23+
set(one_value_args APPLE_LIBRARY LEGACY_TARGET)
2424
cmake_parse_arguments(MATSDK_PACKAGE_DEP "${options}" "${one_value_args}" "" ${ARGN})
2525

2626
if(MATSDK_PACKAGE_DEP_APPLE_SYSTEM)
@@ -35,6 +35,12 @@ function(matsdk_add_package_system_dependency dependency_target canonical_target
3535
elseif(NOT TARGET "${canonical_target}")
3636
find_dependency(${package_name})
3737
endif()
38+
if(NOT TARGET "${canonical_target}"
39+
AND DEFINED MATSDK_PACKAGE_DEP_LEGACY_TARGET
40+
AND TARGET "${MATSDK_PACKAGE_DEP_LEGACY_TARGET}")
41+
matsdk_add_interface_dependency(
42+
"${canonical_target}" "${MATSDK_PACKAGE_DEP_LEGACY_TARGET}")
43+
endif()
3844
if(NOT TARGET "${canonical_target}")
3945
message(FATAL_ERROR
4046
"${package_name} did not create the required ${canonical_target} target.")

0 commit comments

Comments
 (0)