iox-#2011 Updates from review.

Signed-off-by: Chris Lalancette <[email protected]>
eclipse-iceoryx · Apr 10, 2024 · fb08207 · fb08207
1 parent 9a81c23
commit fb08207
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...osh/cmake/cpptoml/cpptoml-cmake-3.5.patch → .../cpptoml/0001-cpptoml-cmake-version.patch b/...osh/cmake/cpptoml/cpptoml-cmake-3.5.patch → .../cpptoml/0001-cpptoml-cmake-version.patch
@@ -2,7 +2,7 @@
 +++ b/CMakeLists.txt	2024-03-26 12:09:59.552800904 +0000
 @@ -1,4 +1,4 @@
 -cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.16)
  project(cpptoml)
- 
+
  set(cpptoml_VERSION 0.4.0)
diff --git a/iceoryx_posh/cmake/cpptoml/CMakeLists.txt b/iceoryx_posh/cmake/cpptoml/CMakeLists.txt
@@ -72,6 +72,15 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE)
     set(cpptoml_DIR ${cpptoml_DIR} CACHE PATH "" FORCE)
 endif()
 
+execute_process(
+    COMMAND git apply -p1 --ignore-space-change --whitespace=nowarn
+    INPUT_FILE "${CMAKE_CURRENT_LIST_DIR}/0001-cpptoml-cmake-version.patch"
+    WORKING_DIRECTORY "${SOURCE_DIR}"
+    RESULT_VARIABLE result)
+if(result)
+    message(WARNING "CMake step [patch] for '${PROJECT_NAME}' failed! Error code: ${result}! Build of '${PROJECT_NAME}' might fail")
+endif()
+
 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} )

diff --git a/iceoryx_posh/cmake/cpptoml/cpptoml.cmake.in b/iceoryx_posh/cmake/cpptoml/cpptoml.cmake.in
@@ -29,7 +29,4 @@ ExternalProject_Add(ext_cpptoml
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
-  PATCH_COMMAND
-    ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn
-      ${CMAKE_CURRENT_SOURCE_DIR}/cpptoml-cmake-3.5.patch
 )