diff options
| author | markdegreef <mgreef@gmail.com> | 2019-04-01 22:35:22 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-01 13:35:22 -0700 |
| commit | 575df0550cefa72e4e5280337770d2ba5079db91 (patch) | |
| tree | bf1d9b5a237e30e82a2de5fad37c3c13b69c7fe5 | |
| parent | a1c6edd6ed96e5ec0b64ca9818a42ce063dd892a (diff) | |
| download | vcpkg-575df0550cefa72e4e5280337770d2ba5079db91.tar.gz vcpkg-575df0550cefa72e4e5280337770d2ba5079db91.zip | |
[fcl] fix linux build (#5582)
* [fcl] fix linux build
Set correct path of cmake config files
| -rw-r--r-- | ports/fcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fcl/portfile.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index 0e425f59b..e486cf90a 100644 --- a/ports/fcl/CONTROL +++ b/ports/fcl/CONTROL @@ -1,4 +1,4 @@ Source: fcl -Version: 0.5.0-3 +Version: 0.5.0-4 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 851a013c2..92781872f 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -36,7 +36,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/") +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fcl") +endif() + file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG) string(REPLACE "unset(_expectedTargets)" |