ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-15 11:08:38 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#14645) shapelib: Use rm_safe from Conan 1.53 and fix cmake_layout import

Browse Source
This commit is contained in:
Jordan Williams
2022-12-13 15:45:11 -06:00
committed by GitHub
parent 290fc71948
commit 06dca474e1
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
recipes/shapelib/all/conanfile.py
View File

@@ -1,11 +1,10 @@
import os
from conan import ConanFile
from conan.tools.cmake import CMake, CMakeToolchain
from conan.tools.cmake import CMake, cmake_layout, CMakeToolchain
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir
from conan.tools.layout import cmake_layout
required_conan_version = ">=1.52.0"
required_conan_version = ">=1.53.0"
class ShapelibConan(ConanFile):
@@ -31,18 +30,9 @@ class ShapelibConan(ConanFile):
def configure(self):
if self.options.shared:
try:
del self.options.fPIC
except Exception:
pass
try:
del self.settings.compiler.libcxx
except Exception:
pass
try:
del self.settings.compiler.cppstd
except Exception:
pass
self.options.rm_safe("fPIC")
self.settings.compiler.rm_safe("cppstd")
self.settings.compiler.rm_safe("libcxx")
def layout(self):
cmake_layout(self, src_folder="src")
@@ -51,8 +41,7 @@ class ShapelibConan(ConanFile):
export_conandata_patches(self)
def source(self):
get(self, **self.conan_data["sources"][self.version],
destination=self.source_folder, strip_root=True)
get(self, **self.conan_data["sources"][self.version], strip_root=True)
def generate(self):
tc = CMakeToolchain(self)