Skip to content

Commit

Permalink
BUILD(shared): build CLI11 into shared target
Browse files Browse the repository at this point in the history
  • Loading branch information
WOLFI3654 committed Oct 20, 2023
1 parent c21a90a commit f6e4840
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions 3rdparty/CLI11
Submodule CLI11 added at 998ef3
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
1 change: 1 addition & 0 deletions scripts/generate_license_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ else()
endif()
endif()

target_link_libraries(shared PUBLIC CLI11::CLI11)

if(client)
add_subdirectory(mumble)

Expand Down

0 comments on commit f6e4840

Please sign in to comment.