Skip to content

Commit

Permalink
Fix BULLET_INCLUDE_DIRS in DARTCoreConfig.cmake
Browse files Browse the repository at this point in the history
The fix from #352 doesn't work if the downstream code
doesn't have the HAVE_BULLET_COLLISION variable defined.
This change just inserts the BULLET_INCLUDE_DIRS
variable into DARTCore_INCLUDE_DIRS
and trusts that it will be blank and not affect
anything if it is unset.

Closes #351.
  • Loading branch information
scpeters committed Mar 21, 2015
1 parent b988923 commit dbc3df4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions cmake/DARTCoreConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ get_filename_component(CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(DARTCore_INCLUDE_DIRS
"@CMAKE_INSTALL_PREFIX@/include"
"@Eigen_INCLUDE_DIRS@"
@BULLET_INCLUDE_DIRS@
)

if(HAVE_BULLET_COLLISION)
set(DARTCore_INCLUDE_DIRS ${DARTCore_INCLUDE_DIRS} "@BULLET_INCLUDE_DIRS@")
endif()

set(DARTCore_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib" "@Boost_LIBRARY_DIRS@")

include("${CURRENT_DIR}/DARTCoreTargets.cmake")
Expand Down

0 comments on commit dbc3df4

Please sign in to comment.