Skip to content

降低 CMake 和 C++ 标准版本 #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lanthora merged 1 commit into from
Jun 27, 2025
Merged

降低 CMake 和 C++ 标准版本 #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion cmake/openssl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/ffi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions src/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/peer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/tun/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/websocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down