Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

giflib: Fix build issue on recent Android NDK versions #25956

Merged
merged 4 commits into from
Nov 18, 2024
Merged

giflib: Fix build issue on recent Android NDK versions #25956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f60700e
giflib: Fix build issue on recent Android NDK versions
eigenraven Nov 15, 2024
18fd5ef
Apply suggestions from code review
eigenraven Nov 15, 2024
63bc3ed
Conan v2 refactor
perseoGI Nov 15, 2024
23eb583
WIP: Revert 5.1.x changes
perseoGI Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/giflib/5.2.x/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.1...3.31.0)
eigenraven marked this conversation as resolved.
Show resolved Hide resolved
project(gif LANGUAGES C)

include(GNUInstallDirs)
Expand Down
2 changes: 1 addition & 1 deletion recipes/giflib/5.2.x/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.15...3.31.0)
eigenraven marked this conversation as resolved.
Show resolved Hide resolved
project(test_package LANGUAGES C)

find_package(GIF REQUIRED CONFIG)
Expand Down
2 changes: 1 addition & 1 deletion recipes/giflib/5.2.x/test_v1_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.15...3.31.0)
eigenraven marked this conversation as resolved.
Show resolved Hide resolved
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
Expand Down