Skip to content

Commit 65c19ec

Browse files
committed
fix issues
1 parent 137d71b commit 65c19ec

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/cmake-multi-platform.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ env:
1111
BUILD_TYPE: Release
1212
TEST_TYPE: CI_TEST
1313
CLEAN_BUILD: false
14+
# Enable vcpkg binary caching for GitHub Actions
15+
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
1416

1517
jobs:
1618
build:
@@ -46,7 +48,7 @@ jobs:
4648
id: protobuf-cache
4749
uses: actions/cache@v3
4850
with:
49-
path: build/third_party/protobuf
51+
path: build/_deps/protobuf-build
5052
key: ${{ runner.os }}-protobuf-build-${{ hashFiles('third_party/protobuf/version.json') }}
5153

5254
- name: Check Protobuf Cache
@@ -82,8 +84,8 @@ jobs:
8284
id: iamf-cache
8385
uses: actions/cache@v3
8486
with:
85-
path: build/third_party/iamf
86-
key: ${{ runner.os }}-iamf-build-${{ hashFiles('third_party/iamf/CMakeLists.txt') }}
87+
path: build/_deps/libiamf-build
88+
key: ${{ runner.os }}-iamf-build-${{ hashFiles('third_party/libiamf/CMakeLists.txt') }}
8789

8890
- name: Check IAMF Cache
8991
if: env.CLEAN_BUILD != 'true'

third_party/libiamf/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if(NOT libiamf_POPULATED)
3838
string(REGEX REPLACE "target_link_libraries\\([^)]*[ \t\n]+m[ \t\n)]+[^)]*\\)" "" LIBIAMF_CMAKE_CONTENT "${LIBIAMF_CMAKE_CONTENT}")
3939
string(REPLACE " m)" ")" LIBIAMF_CMAKE_CONTENT "${LIBIAMF_CMAKE_CONTENT}")
4040
string(REPLACE " m " " " LIBIAMF_CMAKE_CONTENT "${LIBIAMF_CMAKE_CONTENT}")
41+
string(REPLACE "option(BUILD_SHARED_LIBS \"Build shared library\" ON)" "option(BUILD_SHARED_LIBS \"Build shared library\" OFF)" LIBIAMF_CMAKE_CONTENT "${LIBIAMF_CMAKE_CONTENT}")
4142
file(WRITE "${libiamf_SOURCE_DIR}/code/CMakeLists.txt" "${LIBIAMF_CMAKE_CONTENT}")
4243
message(STATUS "Patched libiamf CMakeLists.txt to remove GCC-only flags and m library")
4344
endif()

0 commit comments

Comments
 (0)