iox-eclipse-iceoryx#670 build shared libraries and set version number…

… to 0.99.7 Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
EgorWeders · Apr 9, 2021 · 2533cc3 · 2533cc3
1 parent 212f5f5
commit 2533cc3
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,11 +54,12 @@ See [Eclipse iceoryx 1.0.0 (Almond)](https://projects.eclipse.org/projects/techn
 - iceoryx libs should be build as static libs [\#509](https://github.com/eclipse-iceoryx/iceoryx/issues/509)
 - Build with gcov is broken [\#497](https://github.com/eclipse-iceoryx/iceoryx/issues/497)
 
-## [v0.99.x](https://github.com/eclipse-iceoryx/iceoryx/tree/v0.99.x) (2021-04-xx)
+## [v0.99.7](https://github.com/eclipse-iceoryx/iceoryx/tree/v0.99.7) (2021-04-09)
 
-[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v0.99.6...v0.99.x)
+[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v0.99.6...v0.99.7)
 
 - cleanup testing libraries; if used outside of iceoryx, include paths and link targets must be adjusted
+- build iceoryx_utils, iceoryx_posh and iceoryx_binding_c as shared libraries in colcon
 
 ## [v0.99.6](https://github.com/eclipse-iceoryx/iceoryx/tree/v0.99.6) (2021-04-08)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.99.6
+0.99.7
diff --git a/cmake/package/package.cmake b/cmake/package/package.cmake
@@ -14,13 +14,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.5)
-set(IOX_VERSION_STRING "0.99.6")
-#find_package(iceoryx_utils REQUIRED)
+set(IOX_VERSION_STRING "0.99.7")
 
-#include(IceoryxVersion)
-#parse_version(${IOX_VERSION_STRING})
 project(iceoryx_package VERSION ${IOX_VERSION_STRING})
-#adjust_version()
+
 
 set(CPACK_GENERATOR "DEB")
 set(CPACK_PACKAGE_NAME "iceoryx-${iceoryx_package_VERSION}")

diff --git a/doc/aspice_swe3_4/CMakeLists.txt b/doc/aspice_swe3_4/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-set(IOX_VERSION_STRING "0.99.6")
+set(IOX_VERSION_STRING "0.99.7")
 
 #find_package(iceoryx_utils REQUIRED)
 

diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt
@@ -16,20 +16,21 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.7)
 
-set(IOX_VERSION_STRING "0.99.6")
+set(IOX_VERSION_STRING "0.99.7")
+
 
-find_package(iceoryx_utils REQUIRED)
 
-#include(IceoryxVersion)
-#parse_version(${IOX_VERSION_STRING})
 project(iceoryx_binding_c VERSION ${IOX_VERSION_STRING})
-#adjust_version()
 
+find_package(iceoryx_utils REQUIRED)
 find_package(iceoryx_posh REQUIRED)
 
+
 include(IceoryxPackageHelper)
 include(IceoryxPlatform)
 
+option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
+
 #
 ########## set variables for export ##########
 #

diff --git a/iceoryx_binding_c/package.xml b/iceoryx_binding_c/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_binding_c</name>
-    <version>0.99.6</version>
+    <version>0.99.7</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware C-Language Binding</description>
     <maintainer email="michael.poehnl@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
@@ -16,21 +16,19 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.7)
 
-set(IOX_VERSION_STRING "0.99.6")
+set(IOX_VERSION_STRING "0.99.7")
 
-find_package(iceoryx_utils REQUIRED)
-
-#include(IceoryxVersion)
-#parse_version(${IOX_VERSION_STRING})
 project(iceoryx_dds VERSION ${IOX_VERSION_STRING})
-#adjust_version()
+
+option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
 
 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()
 
+find_package(iceoryx_utils REQUIRED)
 find_package(iceoryx_posh REQUIRED)
 
 include(IceoryxPackageHelper)

diff --git a/iceoryx_integrationtest/package.xml b/iceoryx_integrationtest/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>iceoryx_integrationtest</name>
-  <version>0.99.6</version>
+  <version>0.99.7</version>
   <description>iceoryx Software Integrationtest</description>
     <maintainer email="michael.poehnl@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt
@@ -16,16 +16,14 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.5)
 
-set(IOX_VERSION_STRING "0.99.6")
+set(IOX_VERSION_STRING "0.99.7")
 
-find_package(iceoryx_utils REQUIRED)
-
-#include(IceoryxVersion)
-#parse_version(${IOX_VERSION_STRING})
 project(iceoryx_posh VERSION ${IOX_VERSION_STRING})
-#adjust_version()
 
 find_package(Threads REQUIRED)
+find_package(iceoryx_utils REQUIRED)
+
+option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
 
 option(TOML_CONFIG "TOML support for RouDi with dynamic configuration" ON)
 option(ONE_TO_MANY_ONLY "Restricts communication to 1:n pattern" OFF)
@@ -113,7 +111,7 @@ add_library(iceoryx_posh
     source/popo/building_blocks/chunk_queue_types.cpp
     source/popo/building_blocks/condition_listener.cpp
     source/popo/building_blocks/condition_notifier.cpp
-    source/popo/building_blocks/condition_variable_data.cpp    
+    source/popo/building_blocks/condition_variable_data.cpp
     source/popo/building_blocks/locking_policy.cpp
     source/popo/building_blocks/typed_unique_id.cpp
     source/popo/listener.cpp

diff --git a/iceoryx_posh/cmake/iceoryx_posh_deployment.cmake b/iceoryx_posh/cmake/iceoryx_posh_deployment.cmake
@@ -15,52 +15,52 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # configure deployment
-message("[i] <<<<<<<<<<<<< Start iceoryx_posh configuration: >>>>>>>>>>>>>")
+message(STATUS "[i] <<<<<<<<<<<<< Start iceoryx_posh configuration: >>>>>>>>>>>>>")
 if(ONE_TO_MANY_ONLY)
-     message("[i] Using 1:n communication only!")
+     message(STATUS "[i] Using 1:n communication only!")
      set(IOX_COMMUNICATION_POLICY OneToManyPolicy)
 endif()
 
 if(NOT IOX_COMMUNICATION_POLICY)
-    message("[i] Using m:n communication only!")
+    message(STATUS "[i] Using m:n communication only!")
     set(IOX_COMMUNICATION_POLICY ManyToManyPolicy)
 endif()
 
 if(NOT IOX_MAX_PUBLISHERS)
     set(IOX_MAX_PUBLISHERS 512)
 endif()
-message("[i] IOX_MAX_PUBLISHERS:" ${IOX_MAX_PUBLISHERS})
+message(STATUS "[i] IOX_MAX_PUBLISHERS:" ${IOX_MAX_PUBLISHERS})
 
 if(NOT IOX_MAX_SUBSCRIBERS)
     set(IOX_MAX_SUBSCRIBERS 1024)
 endif()
-message("[i] IOX_MAX_SUBSCRIBERS:" ${IOX_MAX_SUBSCRIBERS})
+message(STATUS "[i] IOX_MAX_SUBSCRIBERS:" ${IOX_MAX_SUBSCRIBERS})
 
 if(NOT IOX_MAX_INTERFACE_NUMBER)
     set(IOX_MAX_INTERFACE_NUMBER 4)
 endif()
-message("[i] IOX_MAX_INTERFACE_NUMBER:" ${IOX_MAX_INTERFACE_NUMBER})
+message(STATUS "[i] IOX_MAX_INTERFACE_NUMBER:" ${IOX_MAX_INTERFACE_NUMBER})
 
 if(NOT IOX_MAX_SUBSCRIBERS_PER_PUBLISHER)
     set(IOX_MAX_SUBSCRIBERS_PER_PUBLISHER 256)
 endif()
-message("[i] IOX_MAX_SUBSCRIBERS_PER_PUBLISHER:" ${IOX_MAX_SUBSCRIBERS_PER_PUBLISHER})
+message(STATUS "[i] IOX_MAX_SUBSCRIBERS_PER_PUBLISHER:" ${IOX_MAX_SUBSCRIBERS_PER_PUBLISHER})
 
 if(NOT IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY)
     set(IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY 8)
 endif()
-message("[i] IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY:" ${IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY})
+message(STATUS "[i] IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY:" ${IOX_MAX_CHUNKS_ALLOCATED_PER_PUBLISHER_SIMULTANEOUSLY})
 
 if(NOT IOX_MAX_PUBLISHER_HISTORY)
     set(IOX_MAX_PUBLISHER_HISTORY 16)
 endif()
-message("[i] IOX_MAX_PUBLISHER_HISTORY:" ${IOX_MAX_PUBLISHER_HISTORY})
+message(STATUS "[i] IOX_MAX_PUBLISHER_HISTORY:" ${IOX_MAX_PUBLISHER_HISTORY})
 
 if(NOT IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY)
     set(IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY 256)
 endif()
-message("[i] IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY:" ${IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY})
-message("[i] <<<<<<<<<<<<<< End iceoryx_posh configuration: >>>>>>>>>>>>>>")
+message(STATUS "[i] IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY:" ${IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY})
+message(STATUS "[i] <<<<<<<<<<<<<< End iceoryx_posh configuration: >>>>>>>>>>>>>>")
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_posh_deployment.hpp.in"
   "${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_posh/iceoryx_posh_deployment.hpp" @ONLY)
diff --git a/iceoryx_posh/package.xml b/iceoryx_posh/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_posh</name>
-    <version>0.99.6</version>
+    <version>0.99.7</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware Posix Shared Memory Library and middleware daemon (RouDi)</description>
     <maintainer email="michael.poehnl@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/iceoryx_utils/CMakeLists.txt b/iceoryx_utils/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-set(IOX_VERSION_STRING "0.99.6")
+set(IOX_VERSION_STRING "0.99.7")
 
 
 #include("${CMAKE_CURRENT_LIST_DIR}/cmake/IceoryxVersion.cmake")
@@ -26,6 +26,8 @@ set(IOX_VERSION_STRING "0.99.6")
 project(iceoryx_utils VERSION ${IOX_VERSION_STRING})
 #adjust_version()
 
+option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
+
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/IceoryxPackageHelper.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/IceoryxPlatform.cmake")
 

diff --git a/iceoryx_utils/package.xml b/iceoryx_utils/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_utils</name>
-    <version>0.99.6</version>
+    <version>0.99.7</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware basic building blocks</description>
     <maintainer email="michael.poehnl@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt
@@ -17,16 +17,11 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-set(IOX_VERSION_STRING "0.99.6")
-
-find_package(iceoryx_utils REQUIRED)
-
-#include(IceoryxVersion)
-#parse_version(${IOX_VERSION_STRING})
-#adjust_version()
+set(IOX_VERSION_STRING "0.99.7")
 
 project(iceoryx_introspection VERSION ${IOX_VERSION_STRING})
 
+find_package(iceoryx_utils REQUIRED)
 find_package(iceoryx_posh REQUIRED)
 
 include(IceoryxPackageHelper)