Merge topic '11430'
a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
This commit is contained in:
commit
c985676a96
@ -31,7 +31,7 @@ macro(_FIND_BULLET_LIBRARY _var)
|
|||||||
find_library(${_var}
|
find_library(${_var}
|
||||||
NAMES
|
NAMES
|
||||||
${ARGN}
|
${ARGN}
|
||||||
PATHS
|
HINTS
|
||||||
${BULLET_ROOT}
|
${BULLET_ROOT}
|
||||||
${BULLET_ROOT}/out/release8/libs
|
${BULLET_ROOT}/out/release8/libs
|
||||||
${BULLET_ROOT}/out/debug8/libs
|
${BULLET_ROOT}/out/debug8/libs
|
||||||
@ -50,9 +50,10 @@ macro(_BULLET_APPEND_LIBRARIES _list _release)
|
|||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
|
find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
|
||||||
PATHS
|
HINTS
|
||||||
${BULLET_ROOT}/include
|
${BULLET_ROOT}/include
|
||||||
${BULLET_ROOT}/src
|
${BULLET_ROOT}/src
|
||||||
|
PATH_SUFFIXES bullet
|
||||||
)
|
)
|
||||||
|
|
||||||
# Find the libraries
|
# Find the libraries
|
||||||
|
Loading…
x
Reference in New Issue
Block a user