From 33d5f85d8564c58541c5b113ed88d226f44c357a Mon Sep 17 00:00:00 2001 From: auth12 Date: Thu, 3 Sep 2020 12:45:58 +0100 Subject: Fixed compilation on macOS. --- CMakeLists.txt | 12 +----------- shared/cpr | 2 +- shared/linux-pe | 2 +- shared/spdlog | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8643d4b..25a9924 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,24 +1,14 @@ cmake_minimum_required(VERSION 3.14) -project(server-client) - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() +project(loader) set(CMAKE_CXX_STANDARD 17) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -set(USE_SYSTEM_CURL ON CACHE BOOL "" FORCE) -set(BUILD_CPR_TESTS OFF CACHE BOOL "" FORCE) -set(SPDLOG_BUILD_TESTING OFF CACHE BOOL "" FORCE) - find_package(OpenSSL REQUIRED) -set(OPENSSL_USE_STATIC_LIBS TRUE) - add_subdirectory(shared/spdlog) add_subdirectory(shared/cpr) add_subdirectory(server) diff --git a/shared/cpr b/shared/cpr index 7e4a803..97d9b86 160000 --- a/shared/cpr +++ b/shared/cpr @@ -1 +1 @@ -Subproject commit 7e4a803fff0787b8a961527016f1060373a7ce64 +Subproject commit 97d9b865dddc16aa677b7cb89fea9c02e1a35848 diff --git a/shared/linux-pe b/shared/linux-pe index 4c12282..54e8f97 160000 --- a/shared/linux-pe +++ b/shared/linux-pe @@ -1 +1 @@ -Subproject commit 4c1228214f17fdf1fb9675ca7221a57f77dc885f +Subproject commit 54e8f976e1da91200a1f351567c2a26e21289c3c diff --git a/shared/spdlog b/shared/spdlog index 22a169b..9cd25dd 160000 --- a/shared/spdlog +++ b/shared/spdlog @@ -1 +1 @@ -Subproject commit 22a169bc319ac06948e7ee0be6b9b0ac81386604 +Subproject commit 9cd25dd21664be8752c3c96df2d58c0544d28c29 -- cgit v1.2.3