Skip to content
Snippets Groups Projects
Commit 0cda715d authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

work around relative paths in bulletconfig

parent 1b09d26e
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,6 @@ set(namespace "fggl") ...@@ -4,8 +4,6 @@ set(namespace "fggl")
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
include(GNUInstallDirs)
option(FGGL_CONAN "Should we use conan to find missing dependencies?" OFF) 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_EXAMPLES "Should we build examples or just the library" ON)
option(FGGL_DOCS "Should we build documentation?" ON) option(FGGL_DOCS "Should we build documentation?" ON)
...@@ -24,6 +22,8 @@ project(fggl ...@@ -24,6 +22,8 @@ project(fggl
HOMEPAGE_URL "" HOMEPAGE_URL ""
LANGUAGES C CXX) LANGUAGES C CXX)
include(GNUInstallDirs)
if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
# slightly cleaner conan support # slightly cleaner conan support
......
...@@ -11,7 +11,13 @@ else() ...@@ -11,7 +11,13 @@ else()
else() else()
# FIXME: this shouldn't be necessary, for modern cmake, linking the libraries should be enough # FIXME: this shouldn't be necessary, for modern cmake, linking the libraries should be enough
target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS}) 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}) target_link_libraries(fggl PUBLIC ${BULLET_LIBRARIES})
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment