diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-05 15:09:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 15:09:23 -0800 |
| commit | 1a2ac53e3d02f0e6df2a77065b9f757cd673f131 (patch) | |
| tree | 5ea4f69cab7a55da49b9aa03e42fb1aaa3a8e69a | |
| parent | 93e7a9e19dda5d3b8255dcc1422beab83a17724b (diff) | |
| parent | a81a51650542ab4db32249f7c596991c4805d0dc (diff) | |
| download | vcpkg-1a2ac53e3d02f0e6df2a77065b9f757cd673f131.tar.gz vcpkg-1a2ac53e3d02f0e6df2a77065b9f757cd673f131.zip | |
Merge pull request #2300 from tobiaskohlbau/master
[fcl] add missing dependencies within cmake
| -rw-r--r-- | ports/fcl/0002-fix_dependencies.patch | 14 | ||||
| -rw-r--r-- | ports/fcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fcl/portfile.cmake | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ports/fcl/0002-fix_dependencies.patch b/ports/fcl/0002-fix_dependencies.patch new file mode 100644 index 000000000..34b069291 --- /dev/null +++ b/ports/fcl/0002-fix_dependencies.patch @@ -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 diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index daadff075..84a9c1f5b 100644 --- a/ports/fcl/CONTROL +++ b/ports/fcl/CONTROL @@ -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 diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index e0cee7e02..851a013c2 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -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) |