From 283358168a3a576a0c9b2cd8e1358d0bdf675d06 Mon Sep 17 00:00:00 2001 From: Bobbey Reese Date: Wed, 30 Nov 2022 17:16:40 -0500 Subject: [PATCH] Try with BUILD_SHARED_LIBS option removed --- recipes/lzham/all/conandata.yml | 10 +++++----- recipes/lzham/all/conanfile.py | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/recipes/lzham/all/conandata.yml b/recipes/lzham/all/conandata.yml index de755645d750f6..0cf799e6a204df 100644 --- a/recipes/lzham/all/conandata.yml +++ b/recipes/lzham/all/conandata.yml @@ -7,23 +7,23 @@ patches: - patch_file: "patches/commits-1.0.0.patch" patch_description: 'Updates code to latest commit for the repo https://github.com/richgel999/lzham_codec' - patch_type: backport + patch_type: official - patch_file: "patches/aarch64-yield-1.0.0.patch" patch_description: 'Uses "yield" rather than "pause" mneumonic to fix aarch64 build' - patch_type: backport + patch_type: portability - patch_file: "patches/cmake-min-req-swap-1.0.0.patch" patch_description: 'Puts cmake_minimum_required before project in all CMakeLists' - patch_type: backport + patch_type: portability - patch_file: "patches/fix-osx-1.0.0.patch" patch_description: "Fixes building on OSX" - patch_type: backport + patch_type: portability - patch_file: "patches/use-lzham-types-1.0.0.patch" patch_description: 'Uses typedefs prefixed with LZHAM to fix linux build errors' - patch_type: backport + patch_type: portability diff --git a/recipes/lzham/all/conanfile.py b/recipes/lzham/all/conanfile.py index 57984620e5fd03..da25e813199c3d 100644 --- a/recipes/lzham/all/conanfile.py +++ b/recipes/lzham/all/conanfile.py @@ -52,6 +52,12 @@ def _patch_sources(self): "add_subdirectory(lzhamtest)\n", "" ) + replace_in_file( + self, + os.path.join(self.source_folder, "CMakeLists.txt"), + "option(BUILD_SHARED_LIBS \"build shared/static libs\" ON)", + "" + ) return new_sln = [] # Remove example and test projects from sln.