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

test rpm and flatpak builds

parent 7357e809
No related branches found
No related tags found
No related merge requests found
...@@ -133,7 +133,7 @@ install(FILES ...@@ -133,7 +133,7 @@ install(FILES
# generate the export targets for the build tree # generate the export targets for the build tree
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
EXPORT fgglTargets EXPORT fgglTargets
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
......
...@@ -24,8 +24,7 @@ modules: ...@@ -24,8 +24,7 @@ modules:
- modules/glm-0.9.9.8.json - modules/glm-0.9.9.8.json
- modules/fmt.yml - modules/fmt.yml
- modules/spdlog.json - modules/spdlog.json
# - shared-modules/glew/glew.json - modules/googletest.yml
# - modules/googletest.yml
- shared-modules/glu/glu-9.json - shared-modules/glu/glu-9.json
- modules/yaml-cpp.yml - modules/yaml-cpp.yml
- modules/assimp.yml - modules/assimp.yml
......
...@@ -67,6 +67,8 @@ fggl dynamic libraries and header files. ...@@ -67,6 +67,8 @@ fggl dynamic libraries and header files.
%files devel %files devel
%{_includedir}/fggl/* %{_includedir}/fggl/*
%{_libdir}/cmake/%{name} %{_libdir}/cmake/%{name}
# this feels like a packaging bug...
%{_libdir}/libimgui.a
%files demos %files demos
%{_bindir}/demo %{_bindir}/demo
......
...@@ -13,17 +13,15 @@ file(GLOB_RECURSE IMGUI_HEADERS "include/*.h") ...@@ -13,17 +13,15 @@ file(GLOB_RECURSE IMGUI_HEADERS "include/*.h")
add_library(imgui STATIC ${IMGUI_SOURCES} ${IMGUI_HEADERS}) add_library(imgui STATIC ${IMGUI_SOURCES} ${IMGUI_HEADERS})
set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
set_target_properties(imgui PROPERTIES PUBLIC_HEADER "${IMGUI_HEADERS}" ) set_target_properties(imgui PROPERTIES PUBLIC_HEADER "${IMGUI_HEADERS}" )
target_include_directories( imgui target_include_directories( imgui
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:include/fggl/imgui> $<INSTALL_INTERFACE:include/fggl/imgui>
) )
install( include(GNUInstallDirs)
TARGETS imgui install(TARGETS imgui
EXPORT fgglTargets EXPORT fgglTargets
PUBLIC_HEADER PUBLIC_HEADER
DESTINATION DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui
${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui
) )
\ No newline at end of file
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