Skip to content

Commit dc6bd97

Browse files
committed
- Remove custom find_mailIO due to a bugfix in this repo
- Rename subproject `Transfer` to `Forwarding`
1 parent eaf5530 commit dc6bd97

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

Diff for: CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.20)
1+
cmake_minimum_required(VERSION 3.18)
22

33
include(utils.cmake)
44

@@ -16,6 +16,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
1616
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
1717
message(STATUS "Compiler is GCC")
1818
add_compile_options(-Wno-volatile -fcoroutines)
19+
find_library(GCC_ATOMIC NAMES atomic atomic.so.1 libatomic.so.1)
1920
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
2021
message(STATUS "Compiler is Intel C++")
2122
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -28,14 +29,13 @@ endif ()
2829
find_library(CPPREDIS_LIB cpp_redis)
2930
find_library(TACOPIE_LIB tacopie)
3031
find_package(Drogon CONFIG REQUIRED)
31-
#find_package(mailio CONFIG REQUIRED) # Wait for maintainer fixing this
32-
find_mailIO(MAILIO_INCLUDE_DIR MAILIO_LIB)
32+
find_package(mailio CONFIG REQUIRED)
3333

3434
add_subdirectory(Shared)
3535
add_subdirectory(Connect)
3636
add_subdirectory(Gaming)
3737
add_subdirectory(Message)
38-
add_subdirectory(Transfer)
38+
add_subdirectory(Forwarding)
3939
add_subdirectory(User)
4040

4141
# To disable tests, comment out the following lines

Diff for: utils.cmake

-10
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,4 @@ function(get_WIN32_WINNT _WIN32_WINNT)
1818
else ()
1919
message(FATAL "CMAKE_SYSTEM_VERSION is not available!")
2020
endif ()
21-
endfunction()
22-
23-
function(find_mailIO MAILIO_INCLUDE_DIR MAILIO_LIB)
24-
if (WIN32)
25-
set(MAILIO_INCLUDE_DIR ${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows/include PARENT_SCOPE)
26-
set(MAILIO_LIB ${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows/lib/mailio.lib PARENT_SCOPE)
27-
elseif (UNIX)
28-
set(MAILIO_INCLUDE_DIR ${CMAKE_BINARY_DIR}/vcpkg_installed/x64-linux/include PARENT_SCOPE)
29-
set(MAILIO_LIB ${CMAKE_BINARY_DIR}/vcpkg_installed/x64-linux/lib/libmailio.a PARENT_SCOPE)
30-
endif ()
3121
endfunction()

0 commit comments

Comments
 (0)