From a293c61c0540eb323a750780941a8cda17ab41b9 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 16 Jan 2015 13:20:58 -0800 Subject: [PATCH] use hifi_library_search_hints() macro --- cmake/modules/FindBullet.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindBullet.cmake b/cmake/modules/FindBullet.cmake index 98d26b5ea4..5b2bd6696c 100644 --- a/cmake/modules/FindBullet.cmake +++ b/cmake/modules/FindBullet.cmake @@ -30,13 +30,16 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) + +include("${MACRO_DIR}/HifiLibrarySearchHints.cmake") +hifi_library_search_hints("bullet") + macro(_FIND_BULLET_LIBRARY _var) find_library(${_var} NAMES ${ARGN} HINTS - $ENV{HIFI_LIB_DIR}/bullet - $ENV{BULLET_ROOT_DIR} + ${BULLET_SEARCH_DIRS} ${BULLET_ROOT} ${BULLET_ROOT}/lib/Release ${BULLET_ROOT}/lib/Debug @@ -58,8 +61,7 @@ endmacro() find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h HINTS - $ENV{HIFI_LIB_DIR}/bullet - $ENV{BULLET_ROOT_DIR} + ${BULLET_SEARCH_DIRS} ${BULLET_ROOT}/include ${BULLET_ROOT}/src PATH_SUFFIXES bullet