diff --git a/CMakeLists.txt b/CMakeLists.txt index 87f888b..8449263 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0) + message(STATUS "You can find build instructions and a list of dependencies in the README at \ https://github.com/BeamMP/BeamMP-Server") @@ -61,8 +62,9 @@ include_directories("rapidjson/include") include_directories("websocketpp") add_subdirectory("socket.io-client-cpp") add_subdirectory("include/commandline") -# builds all libraries that don't have cmakelists -add_subdirectory("lib") +# luasocket +set(WANTS_BUILD_STATIC_LIBRARY ON) +add_subdirectory("lib/luasocket-cmake") set(CMAKE_CXX_STANDARD 17) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index ab2d18a..0000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - - -############# luasocket ############# - -##################################### \ No newline at end of file diff --git a/lib/luasocket-cmake b/lib/luasocket-cmake new file mode 160000 index 0000000..2cb3208 --- /dev/null +++ b/lib/luasocket-cmake @@ -0,0 +1 @@ +Subproject commit 2cb3208cf32d8349c04af2884e50db008ff27ef8