fix shared build

Author: markaren

CMakeLists.txt

@@ -49,10 +49,6 @@ else ()
 
     if (THREEPP_USE_EXTERNAL_GLFW)
         find_package(glfw3 CONFIG REQUIRED)
-
-        if (NOT TARGET "glfw::glfw" AND TARGET "glfw")
-            add_library(glfw::glfw ALIAS glfw)
-        endif ()
     endif ()
 
 endif ()
@@ -131,6 +127,9 @@ install(
         DESTINATION
         ${CMAKE_INSTALL_DATADIR}/threepp)
 
+if (BUILD_SHARED_LIBS AND NOT THREEPP_USE_EXTERNAL_GLFW)
+    install(TARGETS glfw EXPORT threepp-targets)
+endif ()
 install(TARGETS threepp EXPORT threepp-targets)
 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(EXPORT threepp-targets

cmake/config.cmake.in

@@ -4,10 +4,6 @@ include(CMakeFindDependencyMacro)
 
 if (NOT DEFINED EMSCRIPTEN AND @THREEPP_USE_EXTERNAL_GLFW@)
     find_dependency(glfw3 CONFIG)
-
-    if (NOT TARGET "glfw::glfw" AND TARGET "glfw")
-        add_library(glfw::glfw ALIAS glfw)
-    endif()
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/threepp-targets.cmake)

examples/external/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-add_library(imgui STATIC)
+add_library(imgui)
 add_library(imgui::imgui ALIAS imgui)
 target_sources(imgui PRIVATE
         "imgui/imgui.cpp"

src/CMakeLists.txt

@@ -499,15 +499,21 @@ These can be installed on Ubuntu systems via sudo apt install libxinerama-dev li
         set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
         set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
         set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
-        set(GLFW_LIBRARY_TYPE "OBJECT" CACHE STRING "" FORCE)
+        if (BUILD_SHARED_LIBS)
+            set(GLFW_LIBRARY_TYPE "SHARED" CACHE STRING "" FORCE)
+        else()
+            set(GLFW_LIBRARY_TYPE "OBJECT" CACHE STRING "" FORCE)
+        endif()
         add_subdirectory("external/glfw")
 
         # Hide glfw's symbols when building a shared lib
         if (BUILD_SHARED_LIBS)
             set_property(TARGET glfw PROPERTY C_VISIBILITY_PRESET hidden)
+        else ()
+            list(APPEND sources $<TARGET_OBJECTS:glfw>)
         endif ()
 
-        list(APPEND sources $<TARGET_OBJECTS:glfw>)
+
     endif ()
 endif ()
 
@@ -570,8 +576,8 @@ if (NOT DEFINED EMSCRIPTEN)
             "${CMAKE_CURRENT_SOURCE_DIR}/external/glad"
     )
 
-    if (THREEPP_USE_EXTERNAL_GLFW)
-        target_link_libraries(threepp PRIVATE glfw::glfw)
+    if (THREEPP_USE_EXTERNAL_GLFW OR BUILD_SHARED_LIBS)
+        target_link_libraries(threepp PRIVATE glfw)
     else ()
         target_include_directories(threepp PRIVATE BEFORE SYSTEM "external/glfw/include")
         if (APPLE)