Skip to content

Commit

Permalink
Turn gain maps on in ci-unix-shared-installed.yml (#2511)
Browse files Browse the repository at this point in the history
The default values for the install fix are taken from:
https://cmake.org/cmake/help/v3.31/command/install.html#signatures
  • Loading branch information
vrabaud authored Nov 28, 2024
1 parent fa62667 commit 378c646
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-unix-shared-installed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
-DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
-DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_GTEST=LOCAL
-DAVIF_BUILD_GDK_PIXBUF=ON ${{ env.CMAKE_AVIF_FLAGS }}
-DAVIF_ENABLE_EXPERIMENTAL_GAIN_MAP=ON
- name: Build libavif with [[nodiscard]] (ninja)
if: runner.oldest-cmake == 'false'
working-directory: ./build_nodiscard
Expand Down
2 changes: 2 additions & 0 deletions cmake/Modules/LocalLibargparse.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ else()
libargparse
GIT_REPOSITORY "https://github.com/kmurray/libargparse.git"
GIT_TAG ${AVIF_LOCAL_LIBARGPARSE_GIT_TAG}
# TODO(vrabaud) remove once CMake 3.13 is not supported anymore.
PATCH_COMMAND sed -i.bak -e "s:install.*:include(GNUInstallDirs)\\\\ninstall(TARGETS libargparse RUNTIME DESTINATION \\\\$\\\\{CMAKE_INSTALL_BINDIR\\\\} LIBRARY DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\} ARCHIVE DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\}):" CMakeLists.txt
UPDATE_COMMAND ""
)
avif_fetchcontent_populate_cmake(libargparse)
Expand Down

0 comments on commit 378c646

Please sign in to comment.