Fixes for linter

paulharris · Nov 6, 2022 · cf11063 · cf11063
1 parent bf7d67e
commit cf11063
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/recipes/catch2/2.x.x/conanfile.py b/recipes/catch2/2.x.x/conanfile.py
@@ -1,7 +1,7 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import copy, get, rmdir, replace_in_file
+from conan.tools.files import copy, get, rmdir
 from conan.tools.scm import Version
 import os
 
@@ -42,14 +42,8 @@ def config_options(self):
 
     def configure(self):
         if not self.options.with_main:
-            try:
-                del self.options.fPIC
-            except Exception:
-                pass
-            try:
-                del self.options.with_benchmark
-            except Exception:
-                pass
+            self.options.rm_safe("fPIC")
+            self.options.rm_safe("with_benchmark")
 
     def package_id(self):
         if not self.options.with_main:

diff --git a/recipes/catch2/3.x.x/conanfile.py b/recipes/catch2/3.x.x/conanfile.py
@@ -6,7 +6,7 @@
 from conan.tools.scm import Version
 import os
 
-required_conan_version = ">=1.52.0"
+required_conan_version = ">=1.53.0"
 
 
 class Catch2Conan(ConanFile):
@@ -57,10 +57,7 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            try:
-                del self.options.fPIC
-            except Exception:
-                pass
+            self.options.rm_safe("fPIC")
 
     def layout(self):
         cmake_layout(self, src_folder="src")