From da1f30d534dca39807531b75b9b8a9acbcda468e Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Mon, 25 Jul 2022 22:54:21 +0100
Subject: [PATCH] test rpm and flatpak builds
---
CMakeLists.txt | 2 +-
build-aux/com.fossgalaxy.fggl.demo.yml | 3 +--
build-aux/fggl.spec | 2 ++
vendor/imgui/CMakeLists.txt | 8 +++-----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94e956e..143ef81 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 a25a073..56af3ba 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 01567e7..fce69ea 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 6a62653..665c472 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
--
GitLab