BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-06-17 22:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: remove mentions of luasocket again

Browse Source
This commit is contained in:
Lion Kortlepel
2021-08-02 13:32:14 +02:00
parent 5d5f155f0c
commit 9666fff622
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -6
View File
@@ -54,20 +54,16 @@ target_include_directories(BeamMP-Server PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
# luasocket
set(WANTS_BUILD_STATIC_LIBRARY ON)
add_subdirectory("lib/luasocket-cmake")
target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} "socket.io-client-cpp/src") target_include_directories(BeamMP-Server PUBLIC ${Boost_INCLUDE_DIRS} ${LUA_INCLUDE_DIR} "socket.io-client-cpp/src")
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if (UNIX) if (UNIX)
target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket_library_static) target_link_libraries(BeamMP-Server z pthread stdc++fs ${LUA_LIBRARIES} crypto ${OPENSSL_LIBRARIES} commandline sioclient_tls)
elseif (WIN32) elseif (WIN32)
include(FindLua) include(FindLua)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(RapidJSON CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED)
target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls luasocket_library_static) target_link_libraries(BeamMP-Server PRIVATE ws2_32 ZLIB::ZLIB ${LUA_LIBRARIES} ${OPENSSL_LIBRARIES} commandline sioclient_tls)
endif () endif ()