File tree Expand file tree Collapse file tree 2 files changed +3
-39
lines changed Expand file tree Collapse file tree 2 files changed +3
-39
lines changed Original file line number Diff line number Diff line change @@ -17,11 +17,7 @@ set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
17
17
set (INSTALL_INCLUDE_DIR
18
18
include
19
19
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 )
25
21
set (INSTALL_TRANTOR_CMAKE_DIR
26
22
${DEF_INSTALL_TRANTOR_CMAKE_DIR}
27
23
CACHE PATH "Installation directory for cmake files" )
@@ -37,10 +33,6 @@ foreach(p
37
33
endif ()
38
34
endforeach ()
39
35
40
- if (WIN32 )
41
- add_subdirectory (third_party/wepoll )
42
- endif (WIN32 )
43
-
44
36
# include directories
45
37
target_include_directories (
46
38
${PROJECT_NAME}
@@ -80,6 +72,7 @@ set(TRANTOR_SOURCES
80
72
81
73
if (WIN32 )
82
74
set (TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/utils/WindowsSupport.cc )
75
+ set (TRANTOR_SOURCES ${TRANTOR_SOURCES} third_party/wepoll/Wepoll.c )
83
76
endif (WIN32 )
84
77
85
78
find_package (OpenSSL )
@@ -101,7 +94,7 @@ endif()
101
94
target_sources (${PROJECT_NAME} PRIVATE ${TRANTOR_SOURCES} )
102
95
103
96
if (WIN32 )
104
- target_link_libraries (${PROJECT_NAME} PRIVATE ws2_32 Rpcrt4 wepoll )
97
+ target_link_libraries (${PROJECT_NAME} PRIVATE ws2_32 Rpcrt4 )
105
98
else ()
106
99
target_link_libraries (${PROJECT_NAME} PRIVATE pthread )
107
100
endif (WIN32 )
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments