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

fix vendor integration for entt

parent 3d893791
No related branches found
No related tags found
No related merge requests found
...@@ -31,8 +31,9 @@ project(fggl ...@@ -31,8 +31,9 @@ project(fggl
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# vendor dependencies # vendor dependencies
add_subdirectory( vendor/entt )
add_subdirectory( vendor/imgui ) add_subdirectory( vendor/imgui )
add_subdirectory(vendor/glad) add_subdirectory( vendor/glad )
# engine headers # engine headers
file(GLOB_RECURSE public_headers file(GLOB_RECURSE public_headers
...@@ -44,9 +45,6 @@ add_subdirectory( fggl ) ...@@ -44,9 +45,6 @@ add_subdirectory( fggl )
target_compile_options( fggl PRIVATE -Wall -Wpedantic -Wextra -Wodr -fno-strict-aliasing -fno-strict-overflow ) target_compile_options( fggl PRIVATE -Wall -Wpedantic -Wextra -Wodr -fno-strict-aliasing -fno-strict-overflow )
set_property(TARGET fggl PROPERTY INTERPROCEDURAL_OPTIMIZATION True) set_property(TARGET fggl PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
# vendor dependencies
add_subdirectory( integrations/entt )
# Unit Tests # Unit Tests
if (FGGL_TESTS) if (FGGL_TESTS)
include(CTest) include(CTest)
......
...@@ -5,6 +5,8 @@ file(GLOB_RECURSE HEADER_LIST CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/include/fgg ...@@ -5,6 +5,8 @@ file(GLOB_RECURSE HEADER_LIST CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/include/fgg
# Should be shared linkage for legal reasons (LGPL) # Should be shared linkage for legal reasons (LGPL)
add_library(fggl ${HEADER_LIST}) add_library(fggl ${HEADER_LIST})
target_link_libraries(fggl PUBLIC entt)
# we need to tell people using the library about our headers # we need to tell people using the library about our headers
target_include_directories(fggl target_include_directories(fggl
PUBLIC PUBLIC
......
target_include_directories( fggl
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:include>
)
add_library( entt INTERFACE )
target_include_directories( entt
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:include>
)
install(
FILES
include/fggl/vendor/entt.hpp
DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/fggl/vendor/entt.hpp
)
install(TARGETS entt
EXPORT fgglTargets
DESTINATION
${CMAKE_INSTALL_LIBDIR}/fggl/entt
)
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