From 736a2a0339a0fec92ee91e046e211083a17e28ec Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Mon, 25 Jul 2022 22:26:47 +0100
Subject: [PATCH] attempt to fix exporting the static lib for imgui
---
CMakeLists.txt | 12 +++++++-----
vendor/imgui/CMakeLists.txt | 14 +++++---------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a90740..94e956e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,13 +131,15 @@ install(FILES
DESTINATION "${FGGL_CONFIG_PATH}"
)
# generate the export targets for the build tree
+install(TARGETS ${PROJECT_NAME}
+ EXPORT fgglTargets
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
export(EXPORT "${PROJECT_NAME}Targets"
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake"
NAMESPACE ${namespace}::
)
-install(TARGETS ${PROJECT_NAME}
- DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
diff --git a/vendor/imgui/CMakeLists.txt b/vendor/imgui/CMakeLists.txt
index ce27d61..a52e4d7 100644
--- a/vendor/imgui/CMakeLists.txt
+++ b/vendor/imgui/CMakeLists.txt
@@ -11,6 +11,7 @@ set( IMGUI_SOURCES
add_library(imgui STATIC ${IMGUI_SOURCES} )
set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_target_properties(imgui PROPERTIES PUBLIC_HEADER include/* )
target_include_directories( imgui
PUBLIC
@@ -19,14 +20,9 @@ target_include_directories( imgui
)
install(
- FILES
- include/imconfig.h
- include/imgui.h
- include/imgui_internal.h
- include/imstb_rectpack.h
- include/imstb_textedit.h
- include/imstb_truetype.h
+ TARGETS imgui
+ EXPORT fgglTargets
+ PUBLIC_HEADER
DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/fggl/imgui
-)
-install( TARGETS imgui EXPORT fgglTargets )
\ No newline at end of file
+)
\ No newline at end of file
--
GitLab