From 82fbe75127f64be886ae1a563e39ed90399626f1 Mon Sep 17 00:00:00 2001 From: Julian Scholle Date: Thu, 4 Nov 2021 18:46:05 +0100 Subject: [PATCH] [fcl] Fix fcl 0.7.0 does not configure if Doxygen is found (#21155) * [fcl] Fix fcl 0.7.0 does not configure if Doxygen is found * add new fcl version --- ports/fcl/portfile.cmake | 1 + ports/fcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fcl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index 079633dc4e..b9c9fef7d0 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -19,6 +19,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 -DFCL_STATIC_LIBRARY=${FCL_STATIC_LIBRARY} -DFCL_BUILD_TESTS=OFF -DFCL_USE_X64_SSE=${FCL_USE_X64_SSE} diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json index dd0d8808d8..e6edbc50a1 100644 --- a/ports/fcl/vcpkg.json +++ b/ports/fcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fcl", "version": "0.7.0", - "port-version": 2, + "port-version": 3, "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", "homepage": "https://github.com/flexible-collision-library/fcl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d8755acd0d..abb616d6f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2118,7 +2118,7 @@ }, "fcl": { "baseline": "0.7.0", - "port-version": 2 + "port-version": 3 }, "fdk-aac": { "baseline": "2.0.2", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index b3d5c5a79c..e8e1312f62 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a023b16805abecae1b2770df56b4d1a7174493d", + "version": "0.7.0", + "port-version": 3 + }, { "git-tree": "11b59644379cbae75571423312e0c0971e6d3740", "version": "0.7.0",