BUILD(shared): build CLI11 into shared target

mumble-voip · Nov 11, 2023 · 5b60cb4 · 5b60cb4
1 parent c21a90a
commit 5b60cb4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "3rdparty/SPSCQueue"]
 	path = 3rdparty/SPSCQueue
 	url = https://github.com/rigtorp/SPSCQueue.git
+[submodule "3rdparty/CLI11"]
+	path = 3rdparty/CLI11
+	url = https://github.com/CLIUtils/CLI11.git
diff --git a/3rdparty/CLI11 b/3rdparty/CLI11
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,6 +162,7 @@ set(CMAKE_UNITY_BUILD_BATCH_SIZE 40)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ${lto})
 
 if(client OR server)
+	add_subdirectory(${3RDPARTY_DIR}/CLI11)
 	add_subdirectory(src)
 endif()
 

diff --git a/scripts/generate_license_header.py b/scripts/generate_license_header.py
@@ -55,6 +55,7 @@
     ["licensePCRE", "3rdPartyLicenses/pcre_license.txt", "PCRE", "http://www.pcre.org/", "USE_BUILDENV"],
     ["licenseQt", "3rdPartyLicenses/qt_license.txt", "Qt", "https://www.qt.io/", "USE_BUILDENV"],
     ["licenseSQLite3", "3rdPartyLicenses/sqlite3_license.txt", "SQLite3", "http://sqlite.org", "USE_BUILDENV"],
+    ["licenseCLI11", "3rdparty/CLI11/LICENSE", "CLI11", "https://github.com/CLIUtils/CLI11", "USE_BUILDENV"],
     ["licenseXar", "3rdPartyLicenses/xar_license.txt", "XAR", "https://opensource.apple.com/source/xar/", "USE_BUILDENV"], # macOS only
     ["licenseAvahi", "3rdPartyLicenses/avahi_license.txt", "Avahi", "https://www.avahi.org/", "USE_BUILDENV"], # Linux only
     ["licenseDBus", "3rdPartyLicenses/dbus_license.txt", "D-Bus", "https://www.freedesktop.org/wiki/Software/dbus", "USE_BUILDENV"], # Linux only

diff --git a/src/murmur/CMakeLists.txt b/src/murmur/CMakeLists.txt
@@ -79,6 +79,7 @@ target_include_directories(mumble-server PRIVATE
 )
 
 target_link_libraries(mumble-server PRIVATE shared Qt5::Sql)
+target_link_libraries(mumble-server PRIVATE shared CLI11::CLI11)
 
 if(static)
 	# MariaDB and MySQL