diff options
| -rw-r--r-- | modules/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 14 |
2 files changed, 9 insertions, 17 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index af76d9d90..1851f47b9 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -57,10 +57,8 @@ macro(build_modules SRC) if(WIN32) target_link_libraries(${TARG} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") - else() - if(APPLE) - target_link_libraries(${TARG} ${PROGRAM_NAME}) - endif() + elseif(APPLE) + target_link_libraries(${TARG} ${PROGRAM_NAME}) endif() calculate_dependencies(${MODULE_SRC}) # Set the module to be installed to the module directory under the data directory @@ -132,10 +130,8 @@ macro(build_subdir) if(WIN32) target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") - else() - if(APPLE) - target_link_libraries(${SO} ${PROGRAM_NAME}) - endif() + elseif(APPLE) + target_link_libraries(${SO} ${PROGRAM_NAME}) endif() install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules/${DIR_NAME}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba2eff6c9..373677fe7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,16 +12,12 @@ endif() if(HAVE_EPOLL) list(APPEND SRC_SRCS socketengines/socketengine_epoll.cpp) +elseif(HAVE_KQUEUE) + list(APPEND SRC_SRCS socketengines/socketengine_kqueue.cpp) +elseif(HAVE_POLL) + list(APPEND SRC_SRCS socketengines/socketengine_poll.cpp) else() - if(HAVE_KQUEUE) - list(APPEND SRC_SRCS socketengines/socketengine_kqueue.cpp) - else() - if(HAVE_POLL) - list(APPEND SRC_SRCS socketengines/socketengine_poll.cpp) - else() - list(APPEND SRC_SRCS socketengines/socketengine_select.cpp) - endif() - endif() + list(APPEND SRC_SRCS socketengines/socketengine_select.cpp) endif() list(SORT SRC_SRCS) |