1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Sun, 31 Oct 2021 20:57:19 +0100
Subject: Use system cpptoml
Forwarded: not-needed
---
iceoryx_dds/CMakeLists.txt | 2 --
iceoryx_posh/CMakeLists.txt | 4 ----
2 files changed, 6 deletions(-)
diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
index 8a3f411..226db21 100644
--- a/iceoryx_dds/CMakeLists.txt
+++ b/iceoryx_dds/CMakeLists.txt
@@ -21,8 +21,6 @@ set(IOX_VERSION_STRING "2.0.3")
project(iceoryx_dds VERSION ${IOX_VERSION_STRING})
if(NOT cpptoml_FOUND)
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cpptoml/ ${CMAKE_BINARY_DIR}/dependencies/dds_gateway/cpptoml/prebuild)
-
find_package(cpptoml REQUIRED)
endif()
diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt
index 02c9235..0b22bb5 100644
--- a/iceoryx_posh/CMakeLists.txt
+++ b/iceoryx_posh/CMakeLists.txt
@@ -28,10 +28,6 @@ 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)
- 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()
|
