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 6dbd0d4a1..efa48235c 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -68,10 +68,8 @@ macro(build_modules SRC) 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() # Set the module to be installed to the module directory under the data directory install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules) @@ -153,10 +151,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() # Set the module to be installed to the module directory under the data directory diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 46ca4f2fd..49aa803ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,16 +13,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) |