Embed transport dependencies and adjust includes

Author: maxDcb

CMakeLists.txt

@@ -36,13 +36,18 @@ FetchContent_Declare(
   GIT_TAG master
 )
 FetchContent_MakeAvailable(Dnscommunication)
+set_target_properties(Dnscommunication PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${dnscommunication_SOURCE_DIR}/src>;$<INSTALL_INTERFACE:include>")
 
 FetchContent_Declare(
   SocketHandler
   GIT_REPOSITORY https://github.com/maxDcb/libSocketHandler.git
   GIT_TAG master
 )
 FetchContent_MakeAvailable(SocketHandler)
+set_target_properties(SocketHandler PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${sockethandler_SOURCE_DIR}/src>;$<INSTALL_INTERFACE:include>")
+
 
 # PipeHandler and MemoryModule have platform-specific sources
 if(WIN32)
@@ -73,13 +78,26 @@ endif()
 
 FetchContent_MakeAvailable(PipeHandler)
 FetchContent_MakeAvailable(MemoryModule)
+if(WIN32)
+  set(_pipe_inc ${pipehandler_SOURCE_DIR}/src)
+  set(_mm_inc   ${memorymodule_SOURCE_DIR}/src)
+else()
+  set(_pipe_inc ${pipehandler_SOURCE_DIR}/libs/libPipeHandlerDumy/src)
+  set(_mm_inc   ${memorymodule_SOURCE_DIR}/libs/libMemoryModuleDumy/src)
+endif()
+set_target_properties(PipeHandler PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${_pipe_inc}>;$<INSTALL_INTERFACE:include>")
+set_target_properties(MemoryModule PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${_mm_inc}>;$<INSTALL_INTERFACE:include>")
 
 FetchContent_Declare(
   SocksServer
   GIT_REPOSITORY https://github.com/maxDcb/libSocks5.git
   GIT_TAG master
 )
 FetchContent_MakeAvailable(SocksServer)
+set_target_properties(SocksServer PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${socksserver_SOURCE_DIR}/src>;$<INSTALL_INTERFACE:include>")
 
 if(WIN32)
   FetchContent_Declare(
@@ -159,6 +177,11 @@ add_subdirectory(modules)
 
 install(
   DIRECTORY beacon/ listener/ modules/
+            ${sockethandler_SOURCE_DIR}/src/
+            ${pipehandler_SOURCE_DIR}/src/
+            ${memorymodule_SOURCE_DIR}/src/
+            ${socksserver_SOURCE_DIR}/src/
+            ${dnscommunication_SOURCE_DIR}/src/
   DESTINATION include
   FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
 )

beacon/Beacon.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ListenerTcp.hpp>
-#include <ListenerSmb.hpp>
+#include <listener/ListenerTcp.hpp>
+#include <listener/ListenerSmb.hpp>
 #include "SocksTunnelClient.hpp"
 
 #include <queue>

beacon/tests/CMakeLists.txt

@@ -1,4 +1,5 @@
 include_directories(..)
+include_directories(../..)
 include_directories(../../modules/ModuleCmd)
 
 # Unit tests using Catch2

cmake/C2CoreConfig.cmake.in

@@ -1,12 +1,8 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
-find_dependency(SocketHandler)
-find_dependency(PipeHandler)
-find_dependency(MemoryModule)
-find_dependency(SocksServer)
-find_dependency(Dnscommunication)
 find_dependency(OpenSSL)
+find_dependency(Threads)
 
 include("${CMAKE_CURRENT_LIST_DIR}/C2CoreTargets.cmake")