diff --git a/CMakeLists.txt b/CMakeLists.txt index 94e956e20d123934f1b566ea28e41c1b51194e55..143ef814e5a6dbdb5b506b5abcf7908716309b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ install(FILES # generate the export targets for the build tree install(TARGETS ${PROJECT_NAME} EXPORT fgglTargets - DESTINATION "${CMAKE_INSTALL_LIBDIR}" + DESTINATION "${CMAKE_INSTALL_LIBDIR}" PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/build-aux/com.fossgalaxy.fggl.demo.yml b/build-aux/com.fossgalaxy.fggl.demo.yml index a25a073556cd55c57bd0149842d2d9e819d2c89c..56af3ba4990881f80cce944d0cd862773ee836cb 100644 --- a/build-aux/com.fossgalaxy.fggl.demo.yml +++ b/build-aux/com.fossgalaxy.fggl.demo.yml @@ -24,8 +24,7 @@ modules: - modules/glm-0.9.9.8.json - modules/fmt.yml - modules/spdlog.json - # - shared-modules/glew/glew.json - # - modules/googletest.yml + - modules/googletest.yml - shared-modules/glu/glu-9.json - modules/yaml-cpp.yml - modules/assimp.yml diff --git a/build-aux/fggl.spec b/build-aux/fggl.spec index 01567e77ffcdafc558af96e9f5e59d55dd16f8ff..fce69ea05539cf8c902f0ace87148736c548fd3d 100644 --- a/build-aux/fggl.spec +++ b/build-aux/fggl.spec @@ -67,6 +67,8 @@ fggl dynamic libraries and header files. %files devel %{_includedir}/fggl/* %{_libdir}/cmake/%{name} +# this feels like a packaging bug... +%{_libdir}/libimgui.a %files demos %{_bindir}/demo diff --git a/vendor/imgui/CMakeLists.txt b/vendor/imgui/CMakeLists.txt index 6a62653f7f1de3af02748d6cd46bec2e6e5246f2..665c4727492ceb40011ffc8eaf85a3d1b82f0f51 100644 --- a/vendor/imgui/CMakeLists.txt +++ b/vendor/imgui/CMakeLists.txt @@ -13,17 +13,15 @@ file(GLOB_RECURSE IMGUI_HEADERS "include/*.h") add_library(imgui STATIC ${IMGUI_SOURCES} ${IMGUI_HEADERS}) set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON) set_target_properties(imgui PROPERTIES PUBLIC_HEADER "${IMGUI_HEADERS}" ) - target_include_directories( imgui PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<INSTALL_INTERFACE:include/fggl/imgui> ) -install( - TARGETS imgui +include(GNUInstallDirs) +install(TARGETS imgui EXPORT fgglTargets PUBLIC_HEADER - DESTINATION - ${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui ) \ No newline at end of file