build: Add msgpack as git submodule

This commit is contained in:
Lars Toenning
2024-06-09 23:33:59 +02:00
parent 61793a02a1
commit 14cd2ded43
7 changed files with 18 additions and 7 deletions

3
.gitmodules vendored
View File

@@ -4,3 +4,6 @@
[submodule "src/xswiftbus/xplanemp2"] [submodule "src/xswiftbus/xplanemp2"]
path = src/xswiftbus/xplanemp2 path = src/xswiftbus/xplanemp2
url = git@github.com:swift-project/xplanemp2.git url = git@github.com:swift-project/xplanemp2.git
[submodule "third_party/msgpack"]
path = third_party/msgpack
url = https://github.com/msgpack/msgpack-c.git

View File

@@ -143,7 +143,6 @@ endif()
add_subdirectory(cmake/vatsimauth) add_subdirectory(cmake/vatsimauth)
add_subdirectory(cmake/dbus) add_subdirectory(cmake/dbus)
add_subdirectory(cmake/sodium) add_subdirectory(cmake/sodium)
add_subdirectory(cmake/msgpack)
add_subdirectory(cmake/rapidjson) add_subdirectory(cmake/rapidjson)
add_subdirectory(cmake/opus) add_subdirectory(cmake/opus)
add_subdirectory(cmake/crashpad) add_subdirectory(cmake/crashpad)

View File

@@ -1,5 +0,0 @@
# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
add_library(externals_msgpack INTERFACE)
target_include_directories(externals_msgpack INTERFACE ${PROJECT_SOURCE_DIR}/third_party/externals/common/include)

View File

@@ -255,7 +255,7 @@ target_link_libraries(core
input input
sound sound
externals_sodium externals_sodium
externals_msgpack msgpack-cxx
blackconfig blackconfig
PRIVATE PRIVATE
Qt::Qml Qt::Qml

View File

@@ -3,3 +3,4 @@
add_subdirectory(simplecrypt) add_subdirectory(simplecrypt)
add_subdirectory(qjsonwebtoken) add_subdirectory(qjsonwebtoken)
add_subdirectory(cmake/msgpack EXCLUDE_FROM_ALL SYSTEM)

View File

@@ -0,0 +1,12 @@
# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors
# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
# for simplicity, we are using our own CMake file to provide the msgpack-cxx target
add_library(msgpack-cxx INTERFACE)
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/third_party/msgpack/include/)
message(FATAL_ERROR "msgpack not found. Did you forget to initialize the git submodules?")
endif()
target_include_directories(msgpack-cxx INTERFACE ${PROJECT_SOURCE_DIR}/third_party/msgpack/include)

1
third_party/msgpack vendored Submodule

Submodule third_party/msgpack added at 29b9505cb7