export wepoll when fetched

Author: kzhdev

CMakeLists.txt

@@ -40,12 +40,21 @@ if(WIN32)
 
     # 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})
+    target_include_directories(wepoll_lib PUBLIC
+      $<BUILD_INTERFACE:${wepoll_SOURCE_DIR}>
+      $<INSTALL_INTERFACE:include>
+    )
+
+    # Set export properties
+    set_target_properties(wepoll_lib PROPERTIES EXPORT_NAME wepoll)
 
     # Create the wepoll::wepoll target
     add_library(wepoll::wepoll ALIAS wepoll_lib)
 
     message(STATUS "wepoll: fetched and built from GitHub")
+
+    # Mark that we need to install wepoll
+    set(SLICK_SOCKET_INSTALL_WEPOLL TRUE)
   endif()
 endif()
 
@@ -129,10 +138,26 @@ endif()
 # Install headers
 install(DIRECTORY include/ DESTINATION include)
 
+# Install wepoll headers if we fetched it
+if(SLICK_SOCKET_INSTALL_WEPOLL)
+  install(FILES ${wepoll_SOURCE_DIR}/wepoll.h DESTINATION include)
+endif()
+
 # Install library targets (header-only INTERFACE library)
-install(TARGETS slick-socket
-  EXPORT slick-socketTargets
-)
+if(SLICK_SOCKET_INSTALL_WEPOLL)
+  # Install both slick-socket and wepoll_lib
+  install(TARGETS slick-socket wepoll_lib
+    EXPORT slick-socketTargets
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION bin
+  )
+else()
+  # Install only slick-socket (wepoll is external)
+  install(TARGETS slick-socket
+    EXPORT slick-socketTargets
+  )
+endif()
 
 # Install CMake package configuration files
 include(CMakePackageConfigHelpers)

cmake/slick-socketConfig.cmake.in

@@ -5,29 +5,35 @@
 
 include(CMakeFindDependencyMacro)
 
+# Include the targets file (this provides slick::socket and possibly slick::wepoll)
+include("${CMAKE_CURRENT_LIST_DIR}/slick-socketTargets.cmake")
+
 # Platform-specific dependencies
 if(WIN32)
     # Windows requires wepoll for epoll-like functionality
-    # Check if wepoll::wepoll target already exists (from parent project)
+    # Check if wepoll::wepoll target already exists (from parent project or our export)
     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)
+        # Check if we installed wepoll as part of slick-socket
+        if(TARGET slick::wepoll)
+            # Use the bundled wepoll that was fetched during build
+            add_library(wepoll::wepoll ALIAS slick::wepoll)
+        else()
+            # 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}"
-            )
+            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()
 endif()
 
-# Include the targets file
-include("${CMAKE_CURRENT_LIST_DIR}/slick-socketTargets.cmake")
-
 # Set package variables
 set(slick-socket_VERSION @PROJECT_VERSION@)
 set(slick-socket_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)