From 3b79a2d257f29f1ce68604b4af453e9bfa80e018 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 20 May 2020 23:24:22 +0200 Subject: [PATCH] [fcl] Explicity handle FCL_USE_X64_SSE CMake option (#11406) * [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. * Update CONTROL --- ports/fcl/CONTROL | 2 +- ports/fcl/portfile.cmake | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index efd311474..0de5cc858 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 diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index cc5d87f14..f5585ec6e 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()