Skip to content

Commit

Permalink
Merge pull request eclipse-iceoryx#951 from kopernikusauto/iox-#950-e…
Browse files Browse the repository at this point in the history
…xternal-cpptoml

iox-eclipse-iceoryx#950 Allow cpptoml to be provided externally.
  • Loading branch information
elfenpiff authored Oct 27, 2021
2 parents 391a262 + d6d9aa7 commit 2749f89
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- static memory alternative for std::function[\#391](https://github.com/eclipse-iceoryx/iceoryx/issues/391)
- Adding support for Helix QAC 2021.1[\#755](https://github.com/eclipse-iceoryx/iceoryx/issues/755) thanks to @toniglandy1
- Axivion analysis on CI[\#409](https://github.com/eclipse-iceoryx/iceoryx/issues/409)
- Cpptoml can be provided by an external source[\#951](https://github.com/eclipse-iceoryx/iceoryx/issues/)

**Bugfixes:**

Expand Down
2 changes: 2 additions & 0 deletions iceoryx_meta/build_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ option(CCACHE "Use ccache when it's available" ON)
option(CLANG_TIDY "Execute Clang-Tidy" OFF)
option(COVERAGE "Build iceoryx with gcov flags" OFF)
option(DDS_GATEWAY "Builds the iceoryx dds gateway - enables internode communication via dds" OFF)
option(DOWNLOAD_TOML_LIB "Download cpptoml via the CMake ExternalProject module" ON)
option(EXAMPLES "Build all iceoryx examples" OFF)
option(INTROSPECTION "Builds the introspection client which requires the ncurses library with an activated terminfo feature" OFF)
option(ONE_TO_MANY_ONLY "Restricts communication to 1:n pattern" OFF)
Expand Down Expand Up @@ -83,6 +84,7 @@ function(show_config_options)
message(" CLANG_TIDY...........................: " ${CLANG_TIDY})
message(" COVERAGE.............................: " ${COVERAGE})
message(" DDS_GATEWAY..........................: " ${DDS_GATEWAY})
message(" DOWNLOAD_TOML_LIB....................: " ${DOWNLOAD_TOML_LIB})
message(" EXAMPLES.............................: " ${EXAMPLES})
message(" INTROSPECTION........................: " ${INTROSPECTION})
message(" ONE_TO_MANY_ONLY ....................: " ${ONE_TO_MANY_ONLY})
Expand Down
5 changes: 4 additions & 1 deletion iceoryx_posh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ project(iceoryx_posh VERSION ${IOX_VERSION_STRING})
find_package(Threads REQUIRED)
find_package(iceoryx_hoofs REQUIRED)

option(DOWNLOAD_TOML_LIB "Download cpptoml via the CMake ExternalProject module" ON)
option(TOML_CONFIG "TOML support for RouDi with dynamic configuration" ON)
option(ONE_TO_MANY_ONLY "Restricts communication to 1:n pattern" OFF)

if(TOML_CONFIG)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cpptoml/ ${CMAKE_BINARY_DIR}/dependencies/posh/cpptoml/prebuild)
if (DOWNLOAD_TOML_LIB)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cpptoml/ ${CMAKE_BINARY_DIR}/dependencies/posh/cpptoml/prebuild)
endif()

find_package(cpptoml REQUIRED)
endif()
Expand Down

0 comments on commit 2749f89

Please sign in to comment.