From d5e3dad27b238e8fda3b75f3ac518603c076cad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Gr=C3=B3dek?= Date: Wed, 8 Apr 2020 08:42:46 +0200 Subject: [PATCH] Quick and dirty patch to allow imgui and magnum integration build from source along project files --- src/Magnum/ImGuiIntegration/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Magnum/ImGuiIntegration/CMakeLists.txt b/src/Magnum/ImGuiIntegration/CMakeLists.txt index 6cfbc45f6..32ae0a788 100644 --- a/src/Magnum/ImGuiIntegration/CMakeLists.txt +++ b/src/Magnum/ImGuiIntegration/CMakeLists.txt @@ -27,7 +27,7 @@ # find_package(Magnum REQUIRED GL) -find_package(ImGui REQUIRED Sources) +#find_package(ImGui REQUIRED) if(BUILD_STATIC) set(MAGNUM_IMGUIINTEGRATION_BUILD_STATIC 1) @@ -65,12 +65,10 @@ set_target_properties(MagnumImGuiIntegration PROPERTIES FOLDER "Magnum/ImGuiIntegration") if(NOT BUILD_STATIC) set_target_properties(MagnumImGuiIntegration PROPERTIES VERSION ${MAGNUM_LIBRARY_VERSION} SOVERSION ${MAGNUM_LIBRARY_SOVERSION}) -elseif(BUILD_STATIC_PIC) - set_target_properties(MagnumImGuiIntegration PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumImGuiIntegration PROPERTIES POSITION_INDEPENDENT_CODE ON) target_link_libraries(MagnumImGuiIntegration - PUBLIC Magnum::GL ImGui::ImGui - PRIVATE ImGui::Sources) + PUBLIC Magnum::GL imgui::imgui) if(BUILD_TESTS) add_subdirectory(Test)