p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DRAFT ros1-rosbag-storage-vendor-0.0.7.inc: Add patch for cmake error

This commit is contained in:
JeongBong Seo 2019-04-10 10:42:38 +09:00 committed by Herb Kuta
parent 62794b0f13
commit 82c1c4bdc5
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes-ros2/rosbag2/ros1-rosbag-storage-vendor-0.0.7.inc Normal file
View File

@ -0,0 +1,7 @@
# Copyright (c) 2019 LG Electronics, Inc.
FILESEXTRAPATHS_prepend := "${THISDIR}/ros1-rosbag-storage-vendor:"
SRC_URI += " \
file://0001-Pass-toolchain.cmake-to-external-project.patch \
"

24
includes-ros2/rosbag2/ros1-rosbag-storage-vendor/0001-Pass-toolchain.cmake-to-external-project.patch Normal file
View File

@ -0,0 +1,24 @@
From fd17ddf74d1aa32fe48597f5097c62b076efb0b4 Mon Sep 17 00:00:00 2001
From: JeongBong Seo <jb.seo@lge.com>
Date: Wed, 10 Apr 2019 10:29:12 +0900
Subject: Pass toolchain.cmake to external project
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf46706..258a4e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ ExternalProject_Add(ros1_rosbag_storage
URL_MD5 4c8b4c33165b223870f5d77bb697bef6
TIMEOUT 60
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/rosbag_install -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1
+ CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/../toolchain.cmake
PATCH_COMMAND
${PATCH_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/resources/rosbag1_encryption_patch.diff &&
${PATCH_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/resources/bagh.diff &&
--
2.17.1