Skip to content

Commit 215dfb3

Browse files
authored
Compile wepoll directly into trantor (Win) (#71)
1 parent e052988 commit 215dfb3

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

CMakeLists.txt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
1717
set(INSTALL_INCLUDE_DIR
1818
include
1919
CACHE PATH "Installation directory for header files")
20-
if(WIN32 AND NOT CYGWIN)
21-
set(DEF_INSTALL_TRANTOR_CMAKE_DIR cmake)
22-
else()
23-
set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
24-
endif()
20+
set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
2521
set(INSTALL_TRANTOR_CMAKE_DIR
2622
${DEF_INSTALL_TRANTOR_CMAKE_DIR}
2723
CACHE PATH "Installation directory for cmake files")
@@ -37,10 +33,6 @@ foreach(p
3733
endif()
3834
endforeach()
3935

40-
if(WIN32)
41-
add_subdirectory(third_party/wepoll)
42-
endif(WIN32)
43-
4436
# include directories
4537
target_include_directories(
4638
${PROJECT_NAME}
@@ -80,6 +72,7 @@ set(TRANTOR_SOURCES
8072

8173
if(WIN32)
8274
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/utils/WindowsSupport.cc)
75+
set(TRANTOR_SOURCES ${TRANTOR_SOURCES} third_party/wepoll/Wepoll.c)
8376
endif(WIN32)
8477

8578
find_package(OpenSSL)
@@ -101,7 +94,7 @@ endif()
10194
target_sources(${PROJECT_NAME} PRIVATE ${TRANTOR_SOURCES})
10295

10396
if(WIN32)
104-
target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32 Rpcrt4 wepoll)
97+
target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32 Rpcrt4)
10598
else()
10699
target_link_libraries(${PROJECT_NAME} PRIVATE pthread)
107100
endif(WIN32)

third_party/wepoll/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)