[cmake] Make most of vendor libraries OBJECT libraries

maplibre · Oct 9, 2023 · eb0921a · eb0921a
1 parent 7499592
commit eb0921a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/vendor/csscolorparser.cmake b/vendor/csscolorparser.cmake
@@ -2,11 +2,7 @@ if(TARGET mbgl-vendor-csscolorparser)
     return()
 endif()
 
-if(MLN_WITH_QT AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
-    add_library(mbgl-vendor-csscolorparser OBJECT)
-else()
-    add_library(mbgl-vendor-csscolorparser STATIC)
-endif()
+add_library(mbgl-vendor-csscolorparser OBJECT)
 
 target_sources(
     mbgl-vendor-csscolorparser PRIVATE

diff --git a/vendor/icu.cmake b/vendor/icu.cmake
@@ -3,7 +3,7 @@ if(TARGET mbgl-vendor-icu)
 endif()
 
 add_library(
-    mbgl-vendor-icu STATIC
+    mbgl-vendor-icu OBJECT
     ${CMAKE_CURRENT_LIST_DIR}/icu/src/cmemory.cpp
     ${CMAKE_CURRENT_LIST_DIR}/icu/src/cstring.cpp
     ${CMAKE_CURRENT_LIST_DIR}/icu/src/ubidi.cpp

diff --git a/vendor/nunicode.cmake b/vendor/nunicode.cmake
@@ -2,11 +2,7 @@ if(TARGET mbgl-vendor-nunicode)
     return()
 endif()
 
-if(MLN_WITH_QT AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
-    add_library(mbgl-vendor-nunicode OBJECT)
-else()
-    add_library(mbgl-vendor-nunicode STATIC)
-endif()
+add_library(mbgl-vendor-nunicode OBJECT)
 
 target_sources(
     mbgl-vendor-nunicode PRIVATE

diff --git a/vendor/parsedate.cmake b/vendor/parsedate.cmake
@@ -2,11 +2,7 @@ if(TARGET mbgl-vendor-parsedate)
     return()
 endif()
 
-if(MLN_WITH_QT AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
-    add_library(mbgl-vendor-parsedate OBJECT)
-else()
-    add_library(mbgl-vendor-parsedate STATIC)
-endif()
+add_library(mbgl-vendor-parsedate OBJECT)
 
 target_sources(
     mbgl-vendor-parsedate PRIVATE

diff --git a/vendor/sqlite.cmake b/vendor/sqlite.cmake
@@ -3,7 +3,7 @@ if(TARGET mbgl-vendor-sqlite)
 endif()
 
 add_library(
-    mbgl-vendor-sqlite STATIC
+    mbgl-vendor-sqlite OBJECT
     ${CMAKE_CURRENT_LIST_DIR}/sqlite/src/sqlite3.c
 )
 

diff --git a/vendor/zip-archive.cmake b/vendor/zip-archive.cmake
@@ -3,7 +3,7 @@ if(TARGET mbgl-vendor-zip-archive)
 endif()
 
 add_library(
-    mbgl-vendor-zip-archive STATIC
+    mbgl-vendor-zip-archive OBJECT
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.h
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipArchive.m
     ${CMAKE_CURRENT_LIST_DIR}/zip-archive/SSZipArchive/SSZipCommon.h