From 95813e0f4e3f29ba49bfd8957bfe8a68a529b895 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 19 Jan 2020 00:37:56 +0100
Subject: [PATCH] Removed sfizz_objects since we basically have to repeat
 everything anyway...

---
 src/CMakeLists.txt | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6491d4d9..5c1e9f75 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,23 +19,14 @@ target_include_directories (sfizz_parser PUBLIC sfizz)
 target_include_directories (sfizz_parser PUBLIC external)
 target_link_libraries (sfizz_parser PRIVATE absl::strings)
 
-add_library (sfizz_objects OBJECT)
-target_sources(sfizz_objects PRIVATE ${SFIZZ_SOURCES})
-target_include_directories (sfizz_objects PUBLIC external)
-target_link_libraries (sfizz_objects PUBLIC absl::strings absl::span)
-target_link_libraries (sfizz_objects PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads)
-if (UNIX AND NOT APPLE)
-    target_link_libraries (sfizz_objects PRIVATE atomic)
-endif()
-sfizz_link_libsndfile(sfizz_objects)
-
-# Sfizz core library
+# Sfizz static library
 add_library(sfizz_static STATIC)
-target_sources(sfizz_static PRIVATE sfizz/sfizz_wrapper.cpp)
-target_link_libraries (sfizz_static PRIVATE sfizz_objects)
+target_sources(sfizz_static PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp)
 target_include_directories (sfizz_static PUBLIC .)
-target_include_directories (sfizz_static PUBLIC external) # Object dependency is not transitive?
-target_link_libraries (sfizz_static PUBLIC absl::strings absl::span) # Object dependency is not transitive?
+target_include_directories (sfizz_static PUBLIC external)
+target_link_libraries (sfizz_static PUBLIC absl::strings absl::span)
+target_link_libraries (sfizz_static PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads)
+sfizz_link_libsndfile(sfizz_static)
 sfizz_enable_lto_if_needed(sfizz_static)
 
 add_library (sfizz::parser ALIAS sfizz_parser)
@@ -47,21 +38,26 @@ add_library (sfizz::sfizz ALIAS sfizz_static)
 # Shared library and installation target
 if (SFIZZ_SHARED)
     add_library (sfizz_shared SHARED)
-    target_sources(sfizz_shared PRIVATE sfizz/sfizz_wrapper.cpp)
+    target_sources(sfizz_shared PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp)
     target_include_directories (sfizz_shared PRIVATE .)
-    target_link_libraries (sfizz_shared PRIVATE sfizz_objects)
+    target_include_directories (sfizz_static PRIVATE external)
+    target_link_libraries (sfizz_shared PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads)
     target_compile_definitions(sfizz_shared PRIVATE SFIZZ_EXPORT_SYMBOLS)
     set_target_properties (sfizz_shared PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER sfizz.h)
-    # sfizz_link_libsndfile(sfizz_shared)
+    sfizz_link_libsndfile(sfizz_shared)
     sfizz_enable_lto_if_needed(sfizz_shared)
     configure_file (${PROJECT_SOURCE_DIR}/scripts/sfizz.pc.in sfizz.pc @ONLY)
     if (UNIX)
         include (GNUInstallDirs)
         install (TARGETS sfizz_shared
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
         install (FILES
-            ${CMAKE_BINARY_DIR}/src/sfizz.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
+        ${CMAKE_BINARY_DIR}/src/sfizz.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
     endif()
 endif()
+if (UNIX AND NOT APPLE)
+    target_link_libraries (sfizz_static PRIVATE atomic)
+    target_link_libraries (sfizz_shared PRIVATE atomic)
+endif()