Skip to content

Commit c847a40

Browse files
committed
fix lnx
1 parent 4ea3580 commit c847a40

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/android.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v4
4545

46-
- name: Select latest Xcode
47-
run: "sudo xcode-select -s /Applications/Xcode_$XC_VERSION.app"
48-
4946
# CCache
5047
- name: Prepare build cache for pull request
5148
uses: pat-s/always-upload-cache@v3.0.11
@@ -107,6 +104,11 @@ jobs:
107104
with:
108105
cmakeVersion: ${{ env.CMAKE_VERSION }}
109106

107+
- name: Setup compiler
108+
uses: maxim-lobanov/setup-xcode@v1
109+
with:
110+
xcode-version: ${{ env.XC_VERSION }}
111+
110112
- name: Cache Qt
111113
id: cache-qt
112114
uses: pat-s/always-upload-cache@v3.0.11
@@ -150,6 +152,7 @@ jobs:
150152

151153
- name: Install Android Tools
152154
run: |
155+
sdkmanager --update --verbose
153156
sdkmanager --licenses && sdkmanager --verbose "platforms;${SDK_PLATFORM}" "build-tools;${SDK_BUILD_TOOLS}" tools platform-tools
154157
155158
# Input SDK

app/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ target_link_libraries(
517517
Lzma::Lzma
518518
Zstd::Zstd
519519
Bz2::Bz2
520+
${ABSL_TARGETS}
520521
)
521522

522523
if (IOS OR MACOS)

cmake/FindAbsl.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,8 @@ foreach (absl_lib IN ITEMS ${absl_libs})
218218
add_library(Absl::${absl_lib} INTERFACE IMPORTED)
219219
endif ()
220220
endif ()
221-
222221
endforeach ()
223222

224-
if (LNX)
225-
set(ABSL_TARGETS "${ABSL_TARGETS};${ABSL_TARGETS}")
226-
endif ()
227223

228224
if (TARGET Absl::symbolize)
229225
set_target_properties(

0 commit comments

Comments
 (0)