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

fcl: add missing transitive_headers=True, CMP0077 #25381

Merged
merged 6 commits into from
Oct 1, 2024
Merged

fcl: add missing transitive_headers=True, CMP0077 #25381

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f60fb7
fcl: add missing transitive_headers=True, CMP0077
valgur Sep 24, 2024
62b7501
fcl: use tc.cache_variables
valgur Sep 24, 2024
ac98a7d
fcl: remove some unnecessary transitive_libs=True
valgur Sep 24, 2024
3baf85d
fcl: fix cache_variables serialization error
valgur Sep 24, 2024
c66c2b4
fcl: set transitive_libs=False for libccd, test this in test_package
valgur Sep 25, 2024
78c1aa8
Update recipes/fcl/all/conanfile.py
jcar87 Oct 1, 2024
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
42 changes: 23 additions & 19 deletions recipes/fcl/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("eigen/3.4.0")
self.requires("libccd/2.1")
# Used in fcl/common/types.h public header
self.requires("eigen/3.4.0", transitive_headers=True)
# Used in fcl/narrowphase/detail/convexity_based_algorithm/support.h
self.requires("libccd/2.1", transitive_headers=True, transitive_libs=True)
AbrilRBS marked this conversation as resolved.
Show resolved Hide resolved
if self.options.with_octomap:
self.requires("octomap/1.9.7")
# Used in fcl/geometry/octree/octree.h
self.requires("octomap/1.9.7", transitive_headers=True)

def validate(self):
if self.settings.compiler.get_safe("cppstd"):
Expand All @@ -63,25 +66,26 @@ def source(self):

def generate(self):
tc = CMakeToolchain(self)
tc.variables["FCL_ENABLE_PROFILING"] = False
tc.variables["FCL_TREAT_WARNINGS_AS_ERRORS"] = False
tc.variables["FCL_HIDE_ALL_SYMBOLS"] = False
tc.variables["FCL_STATIC_LIBRARY"] = not self.options.shared
tc.variables["FCL_USE_X64_SSE"] = False # Let consumer decide to add relevant compile options, fcl doesn't have simd intrinsics
tc.variables["FCL_USE_HOST_NATIVE_ARCH"] = False
tc.variables["FCL_USE_SSE"] = False
tc.variables["FCL_COVERALLS"] = False
tc.variables["FCL_COVERALLS_UPLOAD"] = False
tc.variables["FCL_WITH_OCTOMAP"] = self.options.with_octomap
tc.cache_variables["FCL_ENABLE_PROFILING"] = False
tc.cache_variables["FCL_TREAT_WARNINGS_AS_ERRORS"] = False
tc.cache_variables["FCL_HIDE_ALL_SYMBOLS"] = False
tc.cache_variables["FCL_STATIC_LIBRARY"] = not self.options.shared
tc.cache_variables["FCL_USE_X64_SSE"] = False # Let consumer decide to add relevant compile options, fcl doesn't have simd intrinsics
tc.cache_variables["FCL_USE_HOST_NATIVE_ARCH"] = False
tc.cache_variables["FCL_USE_SSE"] = False
tc.cache_variables["FCL_COVERALLS"] = False
tc.cache_variables["FCL_COVERALLS_UPLOAD"] = False
tc.cache_variables["FCL_WITH_OCTOMAP"] = self.options.with_octomap
if self.options.with_octomap:
octomap_version_str = self.dependencies["octomap"].ref.version
tc.variables["OCTOMAP_VERSION"] = octomap_version_str
tc.cache_variables["OCTOMAP_VERSION"] = octomap_version_str
octomap_version = Version(octomap_version_str)
tc.variables["OCTOMAP_MAJOR_VERSION"] = octomap_version.major
tc.variables["OCTOMAP_MINOR_VERSION"] = octomap_version.minor
tc.variables["OCTOMAP_PATCH_VERSION"] = octomap_version.patch
tc.variables["BUILD_TESTING"] = False
tc.variables["FCL_NO_DEFAULT_RPATH"] = False
tc.cache_variables["OCTOMAP_MAJOR_VERSION"] = octomap_version.major
valgur marked this conversation as resolved.
Show resolved Hide resolved
tc.cache_variables["OCTOMAP_MINOR_VERSION"] = octomap_version.minor
tc.cache_variables["OCTOMAP_PATCH_VERSION"] = octomap_version.patch
tc.cache_variables["BUILD_TESTING"] = False
tc.cache_variables["FCL_NO_DEFAULT_RPATH"] = False
tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
valgur marked this conversation as resolved.
Show resolved Hide resolved
jcar87 marked this conversation as resolved.
Show resolved Hide resolved
tc.generate()

cd = CMakeDeps(self)
Expand Down
Loading