From e5a2fae48be891b71348c129fb3f18167bfae1f2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 17 May 2020 15:23:23 +0200 Subject: [PATCH 1/2] [fcl] Explicity handle FCL_USE_X64_SSE CMake option The FCL_USE_X64_SSE option is enabled by default in fcl, but it only make sense to enable SSE flags when targeting either x86 or x64. --- ports/fcl/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index cc5d87f14544c2..f5585ec6e179bb 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -14,12 +14,19 @@ else() set(FCL_STATIC_LIBRARY OFF) endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(FCL_USE_X64_SSE ON) +else() + set(FCL_USE_X64_SSE OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DFCL_STATIC_LIBRARY=${FCL_STATIC_LIBRARY} -DFCL_BUILD_TESTS=OFF + -DFCL_USE_X64_SSE=${FCL_USE_X64_SSE} ) vcpkg_install_cmake() From a02bab87e1f18c384d6ec341441f742fa9cdac9e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 18 May 2020 09:25:09 +0200 Subject: [PATCH 2/2] Update CONTROL --- ports/fcl/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index efd311474e2289..0de5cc8581220d 100644 --- a/ports/fcl/CONTROL +++ b/ports/fcl/CONTROL @@ -1,5 +1,5 @@ Source: fcl -Version: 0.6.0 +Version: 0.6.0-1 Homepage: https://github.com/flexible-collision-library/fcl Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles Build-Depends: ccd, octomap, eigen3