Skip to content

Commit

Permalink
Update Findfcl.cmake to support FCL 0.6 (#1441)
Browse files Browse the repository at this point in the history
* Update Findfcl.cmake to support FCL 0.6

* Update changelog
  • Loading branch information
jslee02 committed Mar 19, 2020
1 parent febad10 commit 0be8c3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
* Enabled octomap support on macOS: [#1078](https://github.com/dartsim/dart/pull/1078)
* Removed dependency on Boost::regex: [#1412](https://github.com/dartsim/dart/pull/1412)
* Added support new if() IN_LIST operator in DARTConfig.cmake: [#1434](https://github.com/dartsim/dart/pull/1434)
* Updated Findfcl.cmake to support FCL 0.6: [#1441](https://github.com/dartsim/dart/pull/1441)

### [DART 6.9.2 (2019-08-16)](https://github.com/dartsim/dart/milestone/60?closed=1)

Expand Down
19 changes: 5 additions & 14 deletions cmake/Findfcl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,18 @@
# FCL_INCLUDE_DIRS
# FCL_LIBRARIES
# FCL_VERSION
#
# and the following targets:
# fcl

find_package(PkgConfig QUIET)

# Check to see if pkgconfig is installed.
pkg_check_modules(PC_FCL fcl QUIET)

# Include directories
if(PC_FCL_VERSION VERSION_LESS 0.6.0)
find_path(FCL_INCLUDE_DIRS
NAMES fcl/collision.h
HINTS ${PC_FCL_INCLUDEDIR}
PATHS "${CMAKE_INSTALL_PREFIX}/include")
else()
find_path(FCL_INCLUDE_DIRS
NAMES fcl/narrowphase/collision.h
HINTS ${PC_FCL_INCLUDEDIR}
PATHS "${CMAKE_INSTALL_PREFIX}/include")
endif()
find_path(FCL_INCLUDE_DIRS
NAMES fcl/collision.h # for FCL < 0.6
NAMES fcl/narrowphase/collision.h
HINTS ${PC_FCL_INCLUDEDIR}
PATHS "${CMAKE_INSTALL_PREFIX}/include")

# Libraries
if(MSVC)
Expand Down

0 comments on commit 0be8c3d

Please sign in to comment.