Skip to content

Commit

Permalink
chore(libheifactions)#: More explicit definition of the variable migh…
Browse files Browse the repository at this point in the history
…t work?
  • Loading branch information
BlueCyro committed Aug 6, 2024
1 parent 1435b71 commit 7db48e7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
- name: Configure CMake
working-directory: ${{ steps.buildoutput.outputs.build-output-dir }}
run: $Env:PKG_CONFIG_PATH = "${{ github.workspace }}/third-party/aom/dist/lib/pkgconfig"; cmake --preset=release-noplugins ..
run: |
echo "${{ github.workspace }}\third-party\aom\dist\lib\pkgconfig" >> "$Env:PKG_CONFIG_PATH"
cmake --preset=release-noplugins ..
- name: Build libheif
working-directory: ${{ steps.buildoutput.outputs.build-output-dir }}
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ project(libheif LANGUAGES C CXX VERSION 1.17.6)
# With v2.0.0, we can reset this to more closely follow the real version name, i.e. "2.0.0".
# CMake 3.17.0 added "MACHO_COMPATIBILITY_VERSION", but we are currently stuck at cmake 3.16.3.
set(MACOS_COMPATIBLE_VERSION "17.0.0")
set(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/third-party/aom/dist/lib/pkgconfig")

# https://cmake.org/cmake/help/v3.1/policy/CMP0054.html
cmake_policy(VERSION 3.0...3.22)
Expand Down
1 change: 0 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
"WITH_OpenJPEG_DECODER" : "OFF",
"WITH_OpenJPEG_ENCODER" : "OFF",
"WITH_FFMPEG_DECODER" : "OFF",
"PKG_CONFIG_PATH": "third-party/aom/dist/lib/pkgconfig",

"WITH_REDUCED_VISIBILITY" : "ON",
"WITH_DEFLATE_HEADER_COMPRESSION" : "OFF",
Expand Down

0 comments on commit 7db48e7

Please sign in to comment.