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

Jump to bottom

meshoptimizer: add version 0.20 #22018

Merged
merged 2 commits into from
Jan 6, 2024
Merged

meshoptimizer: add version 0.20 #22018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fca3ab
Add version 0.20
RazielXYZ Dec 28, 2023
c7ad337
Merge branch 'conan-io:master' into meshoptimizer
RazielXYZ Dec 31, 2023
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
3 changes: 3 additions & 0 deletions recipes/meshoptimizer/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.20":
url: "https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.20.tar.gz"
sha256: "CF1077A83958BED3D8DA28A841CA53A6A42D871E49023EDCE64E37002A0F5A48"
"0.17":
url: "https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.17.tar.gz"
sha256: "50f134da6739702d4398f2a3c614acb1d80afb73afed27ac68bc55c9edae64e2"
Expand All @@ -12,5 +15,5 @@
url: "https://github.com/zeux/meshoptimizer/archive/v0.14.tar.gz"
sha256: "5a6e429ecf72325131b439a46297a690f0cab833c7563efdadab26c0a6cf8490"
patches:
"0.14":
- patch_file: "patches/0.14/0001-fix-build-on-old-AppleClang-versions.patch"

Check warning on line 19 in recipes/meshoptimizer/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/0.14/000 ... 
    ^ (line: 19)
10 changes: 6 additions & 4 deletions recipes/meshoptimizer/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from conan.tools.build import stdcpp_library
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rm, rmdir
from conan.tools.scm import Version
import os

required_conan_version = ">=1.54.0"
Expand Down Expand Up @@ -50,10 +51,11 @@ def generate(self):

def _patch_sources(self):
apply_conandata_patches(self)
# No warnings as errors
cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
replace_in_file(self, cmakelists, "add_compile_options(/W4 /WX)", "")
replace_in_file(self, cmakelists, "-Werror", "")
# No warnings as errors - now fine in 0.19 and up
if Version(self.version) < "0.19":
cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
replace_in_file(self, cmakelists, "add_compile_options(/W4 /WX)", "")
replace_in_file(self, cmakelists, "-Werror", "")

def build(self):
self._patch_sources()
Expand Down
2 changes: 2 additions & 0 deletions recipes/meshoptimizer/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.20":
folder: all
"0.17":
folder: all
"0.16":
Expand Down