From b2b60f8ade218920dc3eb5304e7abb7dfa9f3a8d Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 27 Feb 2024 16:32:32 -0500 Subject: Fix websocketpp on gcc --- .gitmodules | 3 --- CMakeLists.txt | 5 +++-- vcpkg.json | 1 + vendor/vcpkg | 2 +- vendor/websocketpp | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) delete mode 160000 vendor/websocketpp diff --git a/.gitmodules b/.gitmodules index f25b54a..ebe016f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "vendor/wswrap"] path = vendor/wswrap url = https://github.com/black-sliver/wswrap.git -[submodule "vendor/websocketpp"] - path = vendor/websocketpp - url = https://github.com/zaphoyd/websocketpp.git [submodule "vendor/asio"] path = vendor/asio url = https://github.com/chriskohlhoff/asio/ diff --git a/CMakeLists.txt b/CMakeLists.txt index d82919a..a6f6342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ endif(MSVC) find_package(wxWidgets CONFIG REQUIRED) find_package(OpenSSL REQUIRED) find_package(yaml-cpp REQUIRED) +find_package(websocketpp REQUIRED) include_directories( vendor/hkutil @@ -16,7 +17,7 @@ include_directories( vendor/asio/asio/include vendor/nlohmann vendor/valijson/include - vendor/websocketpp + ${websocketpp_INCLUDE_DIRS} vendor/wswrap/include ${yaml-cpp_INCLUDE_DIRS} ${OpenSSL_INCLUDE_DIRS} @@ -46,4 +47,4 @@ add_executable(lingo_ap_tracker ) set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20) set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON) -target_link_libraries(lingo_ap_tracker PRIVATE OpenSSL::SSL OpenSSL::Crypto wx::core wx::base wx::net yaml-cpp) +target_link_libraries(lingo_ap_tracker PRIVATE OpenSSL::SSL OpenSSL::Crypto websocketpp::websocketpp wx::core wx::base wx::net yaml-cpp::yaml-cpp) diff --git a/vcpkg.json b/vcpkg.json index 8ba54b0..925212a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,6 @@ { "dependencies": [ + "websocketpp", "wxwidgets", "openssl", "yaml-cpp" diff --git a/vendor/vcpkg b/vendor/vcpkg index 6d69bba..3dd44b9 160000 --- a/vendor/vcpkg +++ b/vendor/vcpkg @@ -1 +1 @@ -Subproject commit 6d69bbacd2fbeae957f034dbbd2b454b5e3941fe +Subproject commit 3dd44b931481d7a8e9ba412621fa810232b66289 diff --git a/vendor/websocketpp b/vendor/websocketpp deleted file mode 160000 index 1b11fd3..0000000 --- a/vendor/websocketpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b11fd301531e6df35a6107c1e8665b1e77a2d8e -- cgit 1.4.1