From c9450bba02dbc0ecf0acb1cbf85e4331e9537729 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 28 Oct 2014 17:32:34 -0700 Subject: [PATCH] Adding Bullet as non-required dependency --- libraries/physics/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt index 5270f08730..8b6025aa1d 100644 --- a/libraries/physics/CMakeLists.txt +++ b/libraries/physics/CMakeLists.txt @@ -7,13 +7,13 @@ include_glm() link_hifi_libraries(shared) -## find BULLET -#find_package(BULLET REQUIRED) -# -#include_directories(SYSTEM "${BULLET_INCLUDE_DIRS}") -# -## append BULLET to our list of libraries to link -#list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${BULLET_LIBRARIES}") +# Note: we rely on the default FindBullet.cmake moduld that comes with cmake +find_package(Bullet) +if (BULLET_FOUND) + include_directories(SYSTEM "${BULLET_INCLUDE_DIRS}") + list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${BULLET_LIBRARIES}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BULLET_PHYSICS}") +endif (BULLET_FOUND) # call macro to link our dependencies and bubble them up via a property on our target link_shared_dependencies()