diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eb567c56091d0e14fdc7ddc9778b77ae37de53c..e51328748942185c31a53fd004b24d9ad01f3ada 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,6 @@ set(namespace "fggl") set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED YES) -include(GNUInstallDirs) - option(FGGL_CONAN "Should we use conan to find missing dependencies?" OFF) option(FGGL_EXAMPLES "Should we build examples or just the library" ON) option(FGGL_DOCS "Should we build documentation?" ON) @@ -24,6 +22,8 @@ project(fggl HOMEPAGE_URL "" LANGUAGES C CXX) +include(GNUInstallDirs) + if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) # slightly cleaner conan support diff --git a/fggl/phys/bullet/CMakeLists.txt b/fggl/phys/bullet/CMakeLists.txt index 05a92dfca921e2098e84502d44171044570e98c4..7c0a2a2ce6d1dfe8c789c74f38014d333b26fbad 100644 --- a/fggl/phys/bullet/CMakeLists.txt +++ b/fggl/phys/bullet/CMakeLists.txt @@ -11,7 +11,13 @@ else() else() # FIXME: this shouldn't be necessary, for modern cmake, linking the libraries should be enough target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS}) - target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIR}) + + if ( BULLET_INCLUDE_DIRS STREQUAL "include/bullet" ) + # FIXME This might actually be a packaging bug? + target_include_directories(fggl PUBLIC ${BULLET_ROOT_DIR}/${BULLET_INCLUDE_DIRS}) + else() + target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIRS}) + endif() target_link_libraries(fggl PUBLIC ${BULLET_LIBRARIES}) endif()