diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/fcl | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/fcl')
| -rw-r--r-- | ports/fcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fcl/portfile.cmake | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index aaae4f57b..161192e79 100644 --- a/ports/fcl/CONTROL +++ b/ports/fcl/CONTROL @@ -1,5 +1,5 @@ Source: fcl
-Version: 0.5.0-6
+Version: 0.5.0-7
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
diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index 65ff738d0..6c7f54551 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -8,13 +8,10 @@ vcpkg_from_github( REF 54e9619bc2b084ee50e986ac3308160d663481c4 SHA512 11bfa3fdeeda6766769a34d2248ca32b6b13ecb32b412c068aa1c7aa3495d55b3f7a82a93621965904f9813c3fd0f128a84f796ae5731d2ff15b85935a0e1261 HEAD_REF fcl-0.5 -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_fix_package_detection.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-fix_dependencies.patch) + 0001_fix_package_detection.patch + 0002-fix_dependencies.patch +) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(FCL_STATIC_LIBRARY ON) |