Removed wepoll from the codebase. bump version to v1.0.6

Author: kzhdev

CHANGELOG

@@ -1,5 +1,9 @@
 # unreleased
 - Removed shared build. There is no exports
+- Converted to truly header-only library (INTERFACE target on all platforms)
+- Added wepoll dependency via vcpkg on Windows with FetchContent fallback
+- Simplified CMake configuration to use single INTERFACE library
+- Automatic wepoll fetch and build if not found
 
 #v1.0.5 - [02/04/2026]
 - Add CMake package configuration support for find_package()

CMakeLists.txt

@@ -5,10 +5,50 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 project(slick-socket
-  VERSION 1.0.5
+  VERSION 1.0.6
   LANGUAGES C CXX
 )
 
+# Options
+option(BUILD_SLICK_SOCKET_EXAMPLES "Build tests" ON)
+option(BUILD_SLICK_SOCKET_TESTING "Build tests" ON)
+option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
+
+if(WIN32)
+  # Find wepoll (vcpkg installation without CMake config)
+  find_path(WEPOLL_INCLUDE_DIR wepoll.h)
+  find_library(WEPOLL_LIBRARY NAMES wepoll)
+
+  if(WEPOLL_INCLUDE_DIR AND WEPOLL_LIBRARY)
+    # Create an imported target for wepoll
+    add_library(wepoll::wepoll STATIC IMPORTED)
+    set_target_properties(wepoll::wepoll PROPERTIES
+      IMPORTED_LOCATION "${WEPOLL_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${WEPOLL_INCLUDE_DIR}"
+    )
+    message(STATUS "wepoll: found at ${WEPOLL_LIBRARY}")
+  else()
+    # Fallback: Fetch wepoll from GitHub and build it
+    message(STATUS "wepoll not found locally, fetching from GitHub...")
+    include(FetchContent)
+    FetchContent_Declare(
+      wepoll
+      GIT_REPOSITORY https://github.com/piscisaureus/wepoll.git
+      GIT_TAG v1.5.8
+    )
+    FetchContent_MakeAvailable(wepoll)
+
+    # Build wepoll as a static library
+    add_library(wepoll_lib STATIC ${wepoll_SOURCE_DIR}/wepoll.c)
+    target_include_directories(wepoll_lib PUBLIC ${wepoll_SOURCE_DIR})
+
+    # Create the wepoll::wepoll target
+    add_library(wepoll::wepoll ALIAS wepoll_lib)
+
+    message(STATUS "wepoll: fetched and built from GitHub")
+  endif()
+endif()
+
 # MSVC configuration
 if(MSVC)
   # Enable policy CMP0091 to allow CMAKE_MSVC_RUNTIME_LIBRARY to be controlled by toolchain/user
@@ -32,7 +72,6 @@ if (CMAKE_BUILD_TYPE MATCHES Release)
   add_definitions(-DNDEBUG)
 endif()
 
-option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
 if(ENABLE_ASAN)
   if(MSVC)
     # MSVC AddressSanitizer (requires Visual Studio 2022 17.7+)
@@ -60,43 +99,28 @@ if (MSVC)
   set(CMAKE_SUPPRESS_REGENERATION true)   # supress zero_check project
 endif()
 
+# Create header-only INTERFACE library
+add_library(slick-socket INTERFACE)
+add_library(slick::socket ALIAS slick-socket)
+
+target_include_directories(slick-socket INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
+
+# Platform-specific dependencies
 if(WIN32)
-  add_library(slick-socket STATIC src/wepoll.c)
-  add_library(slick::socket ALIAS slick-socket)
-  # For backward compatibility
-  add_library(slick_socket ALIAS slick-socket)
-  add_library(slick::slick_socket ALIAS slick-socket)
-
-  set_target_properties(slick-socket PROPERTIES 
-    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
-  )
-  target_include_directories(slick-socket PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-  )
-  target_compile_definitions(slick-socket PUBLIC _WIN32_WINNT=0x0601)
-  target_link_libraries(slick-socket PUBLIC ws2_32)
-elseif(UNIX)
-  add_library(slick-socket INTERFACE)
-  add_library(slick::socket ALIAS slick-socket)
-  # For backward compatibility
-  add_library(slick_socket ALIAS slick-socket)
-  add_library(slick::slick_socket ALIAS slick-socket)
-  target_include_directories(slick-socket INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-  )
+  target_compile_definitions(slick-socket INTERFACE _WIN32_WINNT=0x0601)
+  target_link_libraries(slick-socket INTERFACE ws2_32 wepoll::wepoll)
 endif()
 
 set_target_properties(slick-socket PROPERTIES EXPORT_NAME socket)
 
-option(BUILD_SLICK_SOCKET_EXAMPLES "Build tests" ON)
 if (BUILD_SLICK_SOCKET_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
 # Tests
-option(BUILD_SLICK_SOCKET_TESTING "Build tests" ON)
 if(BUILD_SLICK_SOCKET_TESTING)
   enable_testing()
   add_subdirectory(tests)
@@ -105,21 +129,10 @@ endif()
 # Install headers
 install(DIRECTORY include/ DESTINATION include)
 
-# Install library targets
-if (WIN32)
-  install(TARGETS slick-socket
-    EXPORT slick-socketTargets
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION bin
-  )
-else()
-  install(TARGETS slick-socket
-    EXPORT slick-socketTargets
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-  )
-endif()
+# Install library targets (header-only INTERFACE library)
+install(TARGETS slick-socket
+  EXPORT slick-socketTargets
+)
 
 # Install CMake package configuration files
 include(CMakePackageConfigHelpers)

README.md

@@ -10,46 +10,68 @@ A header-only C++20 networking library providing cross-platform TCP and UDP mult
 ## Features
 
 - **Cross-platform**: Windows and Unix/Linux support
-- **Header-only**: No separate compilation required (Windows requires linking slick-socket.lib)
+- **Header-only**: No separate compilation required
 - **Modern C++**: C++20 design with CRTP for most components
 - **Asynchronous**: Non-blocking socket operations with timeout handling
 - **TCP Communication**: Client and server implementations
 - **UDP Multicast**: One-to-many communication support
 - **Logging**: Template-based logger interface with console output
 
+## Dependencies
+
+- **Windows**: Requires [wepoll](https://github.com/piscisaureus/wepoll) for epoll-like functionality
+  - Automatically fetched via CMake FetchContent if not installed
+  - Or install via vcpkg: `vcpkg install wepoll`
+- **Unix/Linux/macOS**: No external dependencies
+
 ## Installation
 
-### Using FetchContent (Recommended)
+### Using vcpkg (Recommended for Windows users)
+
+If you're using vcpkg, install wepoll first:
+
+```bash
+vcpkg install wepoll
+```
+
+Then use CMake with the vcpkg toolchain:
+
+```bash
+cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=[path-to-vcpkg]/scripts/buildsystems/vcpkg.cmake
+```
+
+### Using FetchContent
 
 The easiest way to use slick-socket is to fetch it directly in your CMakeLists.txt:
 
 ```cmake
 include(FetchContent)
 
-# Uncomment the line below to disable static lib build on Windows
-# set(BUILD_SLICK_SOCKET_STATIC_LIBS OFF CACHE BOOL "" FORCE)
-
-# Uncomment the line below to disable shared lib build on Windows
-# set(BUILD_SLICK_SOCKET_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-
-# Disable slick-socket example, and tests
+# Disable slick-socket examples and tests
 set(BUILD_SLICK_SOCKET_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(BUILD_SLICK_SOCKET_TESTING OFF CACHE BOOL "" FORCE)
+
 FetchContent_Declare(
     slick-socket
     GIT_REPOSITORY https://github.com/SlickQuant/slick-socket.git
-    GIT_TAG v1.0.4  # Use the desired version
+    GIT_TAG v1.0.6  # Use the desired version
 )
 
 FetchContent_MakeAvailable(slick-socket)
 
-# Link against slick-socket
-target_link_libraries(your_target PRIVATE slick-socket)
+# Link against slick-socket (automatically links ws2_32 and wepoll on Windows)
+target_link_libraries(your_target PRIVATE slick::socket)
 ```
 
-On Windows, you also need to link against `ws2_32`:
+**Note**: On Windows, if wepoll is not found, CMake will automatically fetch and build it from GitHub.
+
+### Using find_package
+
+If you have slick-socket installed, you can use it with `find_package`:
+
 ```cmake
-target_link_libraries(your_target PRIVATE slick-socket ws2_32)
+find_package(slick-socket REQUIRED)
+target_link_libraries(your_target PRIVATE slick::socket)
 ```
 
 ### From Source
@@ -58,6 +80,7 @@ target_link_libraries(your_target PRIVATE slick-socket ws2_32)
 
 - C++20 compatible compiler (GCC 11+, Clang 12+, MSVC 2022+)
 - CMake 3.25 or higher
+- **Windows only**: wepoll (automatically fetched if not found)
 
 #### Unix/Linux/macOS
 
@@ -80,37 +103,36 @@ target_link_libraries(your_target PRIVATE slick-socket ws2_32)
 
 #### Windows (Visual Studio)
 
-1. **Configure the build**:
+1. **(Optional) Install wepoll via vcpkg**:
+   ```bash
+   vcpkg install wepoll
+   ```
+
+2. **Configure the build**:
    ```bash
+   # With vcpkg
+   cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE=[path-to-vcpkg]/scripts/buildsystems/vcpkg.cmake
+
+   # Without vcpkg (wepoll will be fetched automatically)
    cmake -S . -B build -G "Visual Studio 17 2022"
    ```
 
-2. **Build the library**:
+3. **Build the library**:
    ```bash
    cmake --build build --config Release
    ```
 
-3. **Copy headers and library**:
+4. **Install (optional)**:
    ```bash
-   xcopy build\dist\include\slick <your-project>\include\slick /E
-   xcopy build\dist\lib\slick-socket.lib <your-project>\lib\
+   cmake --install build --prefix /path/to/install
    ```
 
-4. **Link in your CMakeLists.txt**:
+   Then in your project:
    ```cmake
-   # Add the slick-socket include and lib directories
-   target_include_directories(your_target PRIVATE path/to/slick/include)
-   target_link_directories(your_target PRIVATE path/to/slick/lib)
-
-   # Link the libraries
-   target_link_libraries(your_target PRIVATE slick-socket ws2_32)
+   find_package(slick-socket REQUIRED)
+   target_link_libraries(your_target PRIVATE slick::socket)
    ```
 
-   **Or manually** in Visual Studio:
-   - Add include path: `path/to/slick/include`
-   - Add library path: `path/to/slick/lib`
-   - Link with: `slick-socket.lib` and `ws2_32.lib`
-
 ## Usage
 
 ### Basic Example

cmake/slick-socketConfig.cmake.in

@@ -7,22 +7,27 @@ include(CMakeFindDependencyMacro)
 
 # Platform-specific dependencies
 if(WIN32)
-    # Windows requires Winsock2 library
-    find_dependency(Threads)
+    # Windows requires wepoll for epoll-like functionality
+    # Check if wepoll::wepoll target already exists (from parent project)
+    if(NOT TARGET wepoll::wepoll)
+        # Find wepoll manually (vcpkg installations don't provide CMake config)
+        find_path(WEPOLL_INCLUDE_DIR wepoll.h REQUIRED)
+        find_library(WEPOLL_LIBRARY NAMES wepoll REQUIRED)
+
+        if(WEPOLL_INCLUDE_DIR AND WEPOLL_LIBRARY)
+            # Create an imported target for wepoll
+            add_library(wepoll::wepoll STATIC IMPORTED)
+            set_target_properties(wepoll::wepoll PROPERTIES
+                IMPORTED_LOCATION "${WEPOLL_LIBRARY}"
+                INTERFACE_INCLUDE_DIRECTORIES "${WEPOLL_INCLUDE_DIR}"
+            )
+        endif()
+    endif()
 endif()
 
 # Include the targets file
 include("${CMAKE_CURRENT_LIST_DIR}/slick-socketTargets.cmake")
 
-# Provide backward compatibility aliases
-if(NOT TARGET slick_socket)
-    add_library(slick_socket ALIAS slick::socket)
-endif()
-
-if(NOT TARGET slick::slick_socket)
-    add_library(slick::slick_socket ALIAS slick::socket)
-endif()
-
 # Set package variables
 set(slick-socket_VERSION @PROJECT_VERSION@)
 set(slick-socket_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)