Merge pull request #1326 from ApexAI/iox-#1323-remove-cpptoml-patch-release-1.0

Iox #1323 remove cpptoml patch and fix cmake 3.23 warning for release 1.0

Author: elBoberido

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v1.0.3](https://github.com/eclipse-iceoryx/iceoryx/tree/v1.0.3) (2022-04-08)
+
+[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v1.0.2...v1.0.3)
+
+**Bugfixes:**
+
+- CMake warning: empty command-line option [\#1311](https://github.com/eclipse-iceoryx/iceoryx/issues/1311) thanks to @clalancette
+- Double build issue in ROS2 build farm [\#1323](https://github.com/eclipse-iceoryx/iceoryx/issues/1323)
+
 ## [v1.0.2](https://github.com/eclipse-iceoryx/iceoryx/tree/v1.0.2) (2022-02-18)
 
 [Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v1.0.1...v1.0.2)

iceoryx_posh/cmake/cpptoml/0001-Add-include-limits-to-port-to-GCC-11.patch

@@ -34,12 +34,6 @@ else()
     set(CREATE_PATH_COMMAND mkdir -p)
 endif()
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE)
-    set(TOOLCHAIN_FILE "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
-    set(cpptoml_DIR ${CMAKE_BINARY_DIR}/dependencies/install/lib/cmake/cpptoml)
-    set(cpptoml_DIR ${cpptoml_DIR} CACHE PATH "" FORCE)
-endif()
-
 # set download config, source and build paths
 set(DOWNLOAD_CONFIG_DIR ${CMAKE_BINARY_DIR}/dependencies/cpptoml/download)
 set(SOURCE_DIR ${CMAKE_BINARY_DIR}/dependencies/cpptoml/src)
@@ -64,16 +58,22 @@ endif()
 
 file(MAKE_DIRECTORY ${BUILD_DIR})
 
-execute_process(
-    COMMAND git apply -p1 --ignore-space-change --whitespace=nowarn
-    INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-Add-include-limits-to-port-to-GCC-11.patch"
-    WORKING_DIRECTORY "${SOURCE_DIR}"
-    RESULT_VARIABLE result)
-if(result)
-    message(WARNING "CMake step [patch] for cpptoml failed: ${result}! Build of cpptoml might fail")
+set(CMAKE_ADDITIONAL_OPTIONS
+    "-DCMAKE_C_FLAGS_INIT=${CMAKE_C_FLAGS_INIT}"
+    "-DCMAKE_CXX_FLAGS_INIT=${CMAKE_CXX_FLAGS_INIT}"
+    "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
+    "-DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}"
+    "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+    "-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}"
+    "-DCMAKE_LINKER=${CMAKE_LINKER}")
+
+if(DEFINED CMAKE_TOOLCHAIN_FILE)
+    list(APPEND CMAKE_ADDITIONAL_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    set(cpptoml_DIR ${CMAKE_BINARY_DIR}/dependencies/install/lib/cmake/cpptoml)
+    set(cpptoml_DIR ${cpptoml_DIR} CACHE PATH "" FORCE)
 endif()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "-DCPPTOML_BUILD_EXAMPLES=off" "-DENABLE_LIBCXX=off" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${TOOLCHAIN_FILE}" "${SOURCE_DIR}"
+execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "-DENABLE_LIBCXX=off" "-DCPPTOML_BUILD_EXAMPLES=off" "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}" "${SOURCE_DIR}" ${CMAKE_ADDITIONAL_OPTIONS}
     RESULT_VARIABLE result
     WORKING_DIRECTORY ${BUILD_DIR} )
 if(result)

iceoryx_posh/cmake/cpptoml/CMakeLists.txt

@@ -23,6 +23,7 @@
 #include "iceoryx_utils/cxx/expected.hpp"
 
 #include <cpptoml.h>
+#include <limits> // workaround for missing include in cpptoml.h
 
 namespace iox
 {

iceoryx_posh/include/iceoryx_posh/gateway/toml_gateway_config_parser.hpp

@@ -24,6 +24,7 @@
 #include "iceoryx_utils/posix_wrapper/posix_access_rights.hpp"
 
 #include <cpptoml.h>
+#include <limits> // workaround for missing include in cpptoml.h
 #include <string>
 
 namespace iox