Move all dependencies to deps/

This commit is contained in:
Lion Kortlepel
2021-09-16 00:09:39 +02:00
parent 35a3dab1ce
commit bb34378b8e
7 changed files with 12 additions and 14 deletions

10
.gitmodules vendored
View File

@@ -1,15 +1,15 @@
[submodule "include/commandline"]
path = include/commandline
path = deps/commandline
url = https://github.com/lionkor/commandline
[submodule "socket.io-client-cpp"]
path = socket.io-client-cpp
path = deps/socket.io-client-cpp
url = https://github.com/socketio/socket.io-client-cpp
[submodule "asio"]
path = asio
path = deps/asio
url = https://github.com/chriskohlhoff/asio
[submodule "rapidjson"]
path = rapidjson
path = deps/rapidjson
url = https://github.com/Tencent/rapidjson
[submodule "include/toml11"]
path = include/toml11
path = deps/toml11
url = https://github.com/ToruNiina/toml11

View File

@@ -20,11 +20,11 @@ elseif (UNIX)
endif ()
# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
include_directories("asio/asio/include")
include_directories("rapidjson/include")
include_directories("websocketpp")
add_subdirectory("socket.io-client-cpp")
add_subdirectory("include/commandline")
include_directories("deps/asio/asio/include")
include_directories("deps/rapidjson/include")
include_directories("deps/websocketpp")
add_subdirectory("deps/socket.io-client-cpp")
add_subdirectory("deps/commandline")
set(CMAKE_CXX_STANDARD 17)
@@ -50,12 +50,10 @@ add_executable(BeamMP-Server
include/TPPSMonitor.h src/TPPSMonitor.cpp
include/TNetwork.h src/TNetwork.cpp)
target_include_directories(BeamMP-Server PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
find_package(Lua REQUIRED)
target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} "socket.io-client-cpp/src")
find_package(OpenSSL REQUIRED)
if (UNIX)

0
asio → deps/asio vendored
View File

View File

View File