mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 06:45:37 +08:00
build: Add msgpack as git submodule
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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)
|
|
||||||
@@ -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
|
||||||
|
|||||||
1
third_party/CMakeLists.txt
vendored
1
third_party/CMakeLists.txt
vendored
@@ -3,3 +3,4 @@
|
|||||||
|
|
||||||
add_subdirectory(simplecrypt)
|
add_subdirectory(simplecrypt)
|
||||||
add_subdirectory(qjsonwebtoken)
|
add_subdirectory(qjsonwebtoken)
|
||||||
|
add_subdirectory(cmake/msgpack EXCLUDE_FROM_ALL SYSTEM)
|
||||||
|
|||||||
12
third_party/cmake/msgpack/CMakeLists.txt
vendored
Normal file
12
third_party/cmake/msgpack/CMakeLists.txt
vendored
Normal 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
1
third_party/msgpack
vendored
Submodule
Submodule third_party/msgpack added at 29b9505cb7
Reference in New Issue
Block a user