From 0f2fc2a390a89fd5d0a17e5026ce945081d6e085 Mon Sep 17 00:00:00 2001 From: lanthora Date: Fri, 27 Jun 2025 16:48:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=20CMake=20=E5=92=8C=20C++=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- cmake/openssl/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 2 +- src/ffi/CMakeLists.txt | 2 +- src/main/CMakeLists.txt | 7 +------ src/peer/CMakeLists.txt | 2 +- src/tun/CMakeLists.txt | 2 +- src/utils/CMakeLists.txt | 2 +- src/websocket/CMakeLists.txt | 2 +- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e07088af..528f5270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.18.4) +cmake_minimum_required(VERSION 3.16) project(candy LANGUAGES C CXX VERSION 6.0.4) diff --git a/cmake/openssl/CMakeLists.txt b/cmake/openssl/CMakeLists.txt index 11c65332..9cd1faa4 100644 --- a/cmake/openssl/CMakeLists.txt +++ b/cmake/openssl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.18.4) +cmake_minimum_required(VERSION 3.16) if(POLICY CMP0135) cmake_policy(SET CMP0135 NEW) endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ba8f8ce9..c71b3cf1 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,7 +1,7 @@ aux_source_directory(. DIR_LIB_SRCS) add_library(core STATIC ${DIR_LIB_SRCS}) -set_target_properties(core PROPERTIES CXX_STANDARD 23) +set_target_properties(core PROPERTIES CXX_STANDARD 17) if (${CANDY_STATIC_FMT}) target_link_libraries(core PRIVATE fmt::fmt) diff --git a/src/ffi/CMakeLists.txt b/src/ffi/CMakeLists.txt index 2d6ce599..310e6fb2 100644 --- a/src/ffi/CMakeLists.txt +++ b/src/ffi/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(. DIR_SRCS) add_library(${CANDY_LIBRARY_NAME} STATIC ${DIR_SRCS}) set_target_properties(${CANDY_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${CANDY_EXECUTE_NAME}) -set_target_properties(${CANDY_LIBRARY_NAME} PROPERTIES CXX_STANDARD 23) +set_target_properties(${CANDY_LIBRARY_NAME} PROPERTIES CXX_STANDARD 17) target_link_libraries(${CANDY_LIBRARY_NAME} PRIVATE core) target_link_libraries(${CANDY_LIBRARY_NAME} PRIVATE websocket) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 47b2210a..b82f5d7e 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -1,12 +1,7 @@ aux_source_directory(. DIR_SRCS) add_executable(${CANDY_EXECUTE_NAME} ${DIR_SRCS}) -set_target_properties(${CANDY_EXECUTE_NAME} PROPERTIES CXX_STANDARD 23) - -find_library(STDCPPFS_LIB stdc++fs) -if(STDCPPFS_LIB) - target_link_libraries(${CANDY_EXECUTE_NAME} PRIVATE ${STDCPPFS_LIB}) -endif() +set_target_properties(${CANDY_EXECUTE_NAME} PROPERTIES CXX_STANDARD 17) if (${CANDY_STATIC_SPDLOG}) target_link_libraries(${CANDY_EXECUTE_NAME} PRIVATE spdlog::spdlog) diff --git a/src/peer/CMakeLists.txt b/src/peer/CMakeLists.txt index f7865602..f607ccd7 100644 --- a/src/peer/CMakeLists.txt +++ b/src/peer/CMakeLists.txt @@ -1,7 +1,7 @@ aux_source_directory(. DIR_LIB_SRCS) add_library(peer STATIC ${DIR_LIB_SRCS}) -set_target_properties(peer PROPERTIES CXX_STANDARD 23) +set_target_properties(peer PROPERTIES CXX_STANDARD 17) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(peer PRIVATE ws2_32) diff --git a/src/tun/CMakeLists.txt b/src/tun/CMakeLists.txt index 38a9530a..1cb9be91 100644 --- a/src/tun/CMakeLists.txt +++ b/src/tun/CMakeLists.txt @@ -1,7 +1,7 @@ aux_source_directory(. DIR_LIB_SRCS) add_library(tun STATIC ${DIR_LIB_SRCS}) -set_target_properties(tun PROPERTIES CXX_STANDARD 23) +set_target_properties(tun PROPERTIES CXX_STANDARD 17) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(tun PRIVATE iphlpapi) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 64099906..2fbcad18 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,7 +1,7 @@ aux_source_directory(. DIR_LIB_SRCS) add_library(utils STATIC ${DIR_LIB_SRCS}) -set_target_properties(utils PROPERTIES CXX_STANDARD 23) +set_target_properties(utils PROPERTIES CXX_STANDARD 17) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(utils PRIVATE ws2_32) diff --git a/src/websocket/CMakeLists.txt b/src/websocket/CMakeLists.txt index a07fbac6..b880cf89 100644 --- a/src/websocket/CMakeLists.txt +++ b/src/websocket/CMakeLists.txt @@ -1,7 +1,7 @@ aux_source_directory(. DIR_LIB_SRCS) add_library(websocket STATIC ${DIR_LIB_SRCS}) -set_target_properties(websocket PROPERTIES CXX_STANDARD 23) +set_target_properties(websocket PROPERTIES CXX_STANDARD 17) if (${CANDY_STATIC_SPDLOG}) target_link_libraries(websocket PRIVATE spdlog::spdlog)