Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ecaludp as submodule. #1499

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@
[submodule "thirdparty/udpcap"]
path = thirdparty/udpcap/udpcap
url = https://github.com/eclipse-ecal/udpcap.git
[submodule "thirdparty/ecaludp/ecaludp"]
path = thirdparty/ecaludp/ecaludp
url = https://github.com/eclipse-ecal/ecaludp
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ option(ECAL_THIRDPARTY_BUILD_TCP_PUBSUB "Build tcp_pubsub library with eC
option(ECAL_THIRDPARTY_BUILD_TERMCOLOR "Build termcolor with eCAL" ON)
option(ECAL_THIRDPARTY_BUILD_TINYXML2 "Build tinyxml2 with eCAL" ON)
option(ECAL_THIRDPARTY_BUILD_UDPCAP "Build udpcap library with eCAL" OFF)
option(ECAL_THIRDPARTY_BUILD_ECALUDP "Build the builtin ecaludp library from the submodule" ON)

if(WIN32)
option(ECAL_THIRDPARTY_BUILD_PROTOBUF "Build protobuf with eCAL" ON)
Expand Down Expand Up @@ -234,7 +235,8 @@ set(possible_subprojects
tinyxml2
udpcap
yaml-cpp
#zlib zlibstatic
#zlib zlibstatic
ecaludp
)

# We should rename the option, but don't know how to do in in a
Expand Down Expand Up @@ -588,6 +590,7 @@ message(STATUS "ECAL_THIRDPARTY_BUILD_TERMCOLOR : ${ECAL_THIRDPAR
message(STATUS "ECAL_THIRDPARTY_BUILD_TINYXML2 : ${ECAL_THIRDPARTY_BUILD_TINYXML2}")
message(STATUS "ECAL_THIRDPARTY_BUILD_UDPCAP : ${ECAL_THIRDPARTY_BUILD_UDPCAP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_YAML-CPP : ${ECAL_THIRDPARTY_BUILD_YAML-CPP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_ECALUDP : ${ECAL_THIRDPARTY_BUILD_ECALUDP}")
message(STATUS "ECAL_LINK_HDF5_SHARED : ${ECAL_LINK_HDF5_SHARED}")
message(STATUS "CPACK_PACK_WITH_INNOSETUP : ${CPACK_PACK_WITH_INNOSETUP}")
message(STATUS "--------------------------------------------------------------------------------")
23 changes: 20 additions & 3 deletions thirdparty/asio/build-asio.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
add_library(asio INTERFACE)
target_include_directories(asio INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/asio/include)
add_library(asio INTERFACE EXCLUDE_FROM_ALL)
target_include_directories(asio INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/asio/asio/include>
)
target_compile_definitions(asio INTERFACE ASIO_STANDALONE)

add_library(asio::asio ALIAS asio)

list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules)
list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules)

# We don't want to install asio. However we need to have the commands
# Otherwise CMake will not be happy
install(
TARGETS asio
EXPORT asioTargets
)

install(
EXPORT asioTargets
FILE asioTargets.cmake
DESTINATION lib/CMake
NAMESPACE asio::
COMPONENT asio_dev
)
1 change: 1 addition & 0 deletions thirdparty/ecaludp/Modules/Findecaludp.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(ecaludp_FOUND TRUE)
15 changes: 15 additions & 0 deletions thirdparty/ecaludp/build-ecaludp.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
set(ECALUDP_ENABLE_NPCAP ${ECAL_CORE_NPCAP_SUPPORT})
set(ECALUDP_BUILD_SAMPLES OFF)
set(ECALUDP_BUILD_TESTS OFF)
set(ECALUDP_USE_BUILTIN_ASIO OFF)
set(ECALUDP_USE_BUILTIN_RECYCLE OFF)
set(ECALUDP_USE_BUILTIN_UDPCAP OFF)
set(ECALUDP_LIBRARY_TYPE STATIC)

# Add ecaludp library from subdirectory
add_subdirectory(thirdparty/ecaludp/ecaludp EXCLUDE_FROM_ALL)

# move the ecaludp target to a subdirectory in the IDE
set_property(TARGET ecaludp PROPERTY FOLDER lib/ecaludp)

list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules)
1 change: 1 addition & 0 deletions thirdparty/ecaludp/ecaludp
Submodule ecaludp added at 13f5ba
Loading