Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix cmake config for bullet after c++-11 changes

Browse source
This commit is contained in:
Andrew Meadows 2014-12-18 17:34:39 -08:00
parent 11f01e1859
commit 25b00977be
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/macros/IncludeBullet.cmake
View file

@ -10,8 +10,9 @@
macro(INCLUDE_BULLET) macro(INCLUDE_BULLET)
find_package(Bullet) find_package(Bullet)
if (BULLET_FOUND) if (BULLET_FOUND)
include_directories(SYSTEM "${BULLET_INCLUDE_DIRS}") include_directories("${BULLET_INCLUDE_DIRS}")
list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${BULLET_LIBRARIES}") if (APPLE OR UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BULLET_PHYSICS") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BULLET_PHYSICS -isystem ${BULLET_INCLUDE_DIRS}")
endif ()
endif (BULLET_FOUND) endif (BULLET_FOUND)
endmacro(INCLUDE_BULLET) endmacro(INCLUDE_BULLET)

3
libraries/physics/CMakeLists.txt
View file

@ -5,6 +5,9 @@ setup_hifi_library()
include_glm() include_glm()
include_bullet() include_bullet()
if (BULLET_FOUND)
target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
endif (BULLET_FOUND)
link_hifi_libraries(shared fbx entities) link_hifi_libraries(shared fbx entities)
include_hifi_library_headers(fbx) include_hifi_library_headers(fbx)