Skip to content

Commit

Permalink
iox-eclipse-iceoryx#736 update cyclonedds and cyclonedds-cxx to idlcx…
Browse files Browse the repository at this point in the history
…x branch

Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
  • Loading branch information
dkroenke committed Jul 27, 2021
1 parent ae2738c commit ac1cd29
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 417 deletions.
14 changes: 4 additions & 10 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,16 @@ cpptoml library (v0.1.1)
* Usage: as-is, static-linking
* enabled by default build

Eclipse Cyclone DDS (0.7.0)
Eclipse Cyclone DDS (Branch idlcxx)
* License: Eclipse Public License v. 2.0 or the Eclipse Distribution License v. 1.0
* Project: https://github.com/eclipse-cyclonedds/cyclonedds
* Source: https://github.com/eclipse-cyclonedds/cyclonedds/tree/0.7.0
* Source: https://github.com/eclipse-cyclonedds/cyclonedds/tree/idlcxx
* Usage: as-is, static-linking

C++ binding for Eclipse Cyclone DDS (Git Commit a7285c9d10d2da223d5a2fb8c9c04e591bcb3627)
C++ binding for Eclipse Cyclone DDS (Branch idlcxx)
* License: Eclipse Public License v. 2.0 or the Eclipse Distribution License v. 1.0
* Project: https://github.com/eclipse-cyclonedds/cyclonedds-cxx
* Source: https://github.com/eclipse-cyclonedds/cyclonedds-cxx/tree/a7285c9d10d2da223d5a2fb8c9c04e591bcb3627
* Usage: as-is, static-linking

CXX Idl compiler for CycloneDDS (idlpp-cxx-1.0.0)
* License: Eclipse Public License v. 2.0 or the Eclipse Distribution License v. 1.0
* Project: https://github.com/ADLINK-IST/idlpp-cxx
* Source: https://github.com/ADLINK-IST/idlpp-cxx/tree/idlpp-cxx-1.0.0
* Source: https://github.com/eclipse-cyclonedds/cyclonedds-cxx/tree/idlcxx
* Usage: as-is, static-linking

### Tools used by iceoryx
Expand Down
8 changes: 4 additions & 4 deletions cmake/cyclonedds/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -90,8 +91,7 @@ function(fetch_and_install name)
endif()
endfunction()

# ===== Install
# ===== Install

fetch_and_install(idlpp-cxx)
fetch_and_install(cyclonedds)
fetch_and_install(cyclonedds-cxx -DBUILD_TESTING=OFF)
fetch_and_install(cyclonedds -DBUILD_IDLC=OFF)
fetch_and_install(cyclonedds-cxx)
3 changes: 2 additions & 1 deletion cmake/cyclonedds/cyclonedds-cxx.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,7 +21,7 @@ project(cyclonedds-cxx-download NONE)
include(ExternalProject)
ExternalProject_Add(ext_cyclonedds_cxx
GIT_REPOSITORY https://github.com/eclipse-cyclonedds/cyclonedds-cxx.git
GIT_TAG a7285c9d10d2da223d5a2fb8c9c04e591bcb3627
GIT_TAG idlcxx
SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/cyclonedds-cxx/src"
BINARY_DIR "${CMAKE_BINARY_DIR}/dependencies/cyclonedds-cxx/build"
CONFIGURE_COMMAND ""
Expand Down
3 changes: 2 additions & 1 deletion cmake/cyclonedds/cyclonedds.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,7 +21,7 @@ project(cyclonedds-download NONE)
include(ExternalProject)
ExternalProject_Add(ext_cyclonedds
GIT_REPOSITORY https://github.com/eclipse-cyclonedds/cyclonedds.git
GIT_TAG 0.7.0
GIT_TAG idlcxx
SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/cyclonedds/src"
BINARY_DIR "${CMAKE_BINARY_DIR}/dependencies/cyclonedds/build"
CONFIGURE_COMMAND ""
Expand Down
30 changes: 0 additions & 30 deletions cmake/cyclonedds/idlpp-cxx.cmake.in

This file was deleted.

Loading

0 comments on commit ac1cd29

Please sign in to comment.