mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 16:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fcl: add missing dependencies within cmake

Browse Source 
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
This commit is contained in:
Tobias Kohlbau 2017-12-05 13:15:47 +01:00
parent 216f7137b9
commit a81a516505
No known key found for this signature in database
GPG Key ID: 9D0719F9F4AF4468
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/fcl/0002-fix_dependencies.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ce1f77..1f3e863 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,8 +10,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
SOVERSION ${FCL_ABI_VERSION})
target_link_libraries(${PROJECT_NAME}
- PUBLIC ${OCTOMAP_LIBRARIES}
- PRIVATE ${CCD_LIBRARIES}
+ PUBLIC octomap octomath ccd
PRIVATE ${Boost_LIBRARIES})
target_include_directories(${PROJECT_NAME} INTERFACE

2
ports/fcl/CONTROL
View File

@ -1,4 +1,4 @@
Source: fcl
Version: 0.5.0-2
Version: 0.5.0-3
Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
Build-Depends: boost, ccd, octomap

8
ports/fcl/portfile.cmake
View File

@ -16,7 +16,8 @@ vcpkg_from_github(
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_fix_package_detection.patch)
${CMAKE_CURRENT_LIST_DIR}/0001_fix_package_detection.patch
${CMAKE_CURRENT_LIST_DIR}/0002-fix_dependencies.patch)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(FCL_STATIC_LIBRARY ON)
@ -37,6 +38,11 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/")
file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG)
string(REPLACE "unset(_expectedTargets)"
"unset(_expectedTargets)\n\nfind_package(octomap REQUIRED)\nfind_package(ccd REQUIRED)" FCL_CONFIG "${FCL_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake "${FCL_CONFIG}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fcl RENAME copyright)