Skip to content

Commit

Permalink
giflib: Fix build issue on recent Android NDK versions (#25956)
Browse files Browse the repository at this point in the history
* giflib: Fix build issue on recent Android NDK versions

* Apply suggestions from code review

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* Conan v2 refactor

* WIP: Revert 5.1.x changes

---------

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: PerseoGI <perseog@jfrog.com>
  • Loading branch information
3 people authored Nov 18, 2024
1 parent bbddb31 commit 5fecff8
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 73 deletions.
8 changes: 0 additions & 8 deletions recipes/giflib/5.1.x/test_v1_package/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions recipes/giflib/5.1.x/test_v1_package/conanfile.py

This file was deleted.

2 changes: 1 addition & 1 deletion recipes/giflib/5.2.x/CMakeLists.txt
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.15)
project(gif LANGUAGES C)

include(GNUInstallDirs)
Expand Down
4 changes: 4 additions & 0 deletions recipes/giflib/5.2.x/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ patches:
patch_description: "Use strtok_s instead of strtok_r with MSVC"
patch_type: "portability"
- patch_file: "patches/0001-msvc-unistd.patch"
patch_description: "import unistd in non windows os"
patch_type: "portability"
- patch_file: "patches/5.2.1-0002-msvc-export.patch"
patch_description: "export symbols with MSVC"
patch_type: "portability"
7 changes: 1 addition & 6 deletions recipes/giflib/5.2.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from conan.tools.microsoft import is_msvc
import os

required_conan_version = ">=1.53.0"
required_conan_version = ">=2.0.9"


class GiflibConan(ConanFile):
Expand Down Expand Up @@ -79,8 +79,3 @@ def package_info(self):
self.cpp_info.libs = ["gif"]
if is_msvc(self):
self.cpp_info.defines.append("USE_GIF_DLL" if self.options.shared else "USE_GIF_LIB")

# TODO: to remove in conan v2
self.cpp_info.names["cmake_find_package"] = "GIF"
self.cpp_info.names["cmake_find_package_multi"] = "GIF"
self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
8 changes: 0 additions & 8 deletions recipes/giflib/5.2.x/test_v1_package/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions recipes/giflib/5.2.x/test_v1_package/conanfile.py

This file was deleted.

0 comments on commit 5fecff8

Please sign in to comment.