From f47d2bb8afbcdd5eb838812c4a4c7ccc49a5c4fb Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 10 Jul 2020 15:01:44 +0200 Subject: [PATCH] make sure we use case-sensative BULLET_ prefix --- CMakeLists.txt | 2 +- components/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c5bf22fd..dbe28fd84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,7 +311,7 @@ include_directories("." ${Boost_INCLUDE_DIR} ${MyGUI_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} - ${Bullet_INCLUDE_DIRS} + ${BULLET_INCLUDE_DIRS} ) link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 1d4a84ce1..86d657792 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -210,7 +210,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() endif () -include_directories(${Bullet_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR}) @@ -229,7 +229,7 @@ target_link_libraries(components ${OSGGA_LIBRARIES} ${OSGSHADOW_LIBRARIES} ${OSGANIMATION_LIBRARIES} - ${Bullet_LIBRARIES} + ${BULLET_LIBRARIES} ${SDL2_LIBRARIES} ${OPENGL_gl_LIBRARY} ${MyGUI_LIBRARIES}