diff options
| author | Guilhem Saurel | 2020-06-24 09:24:20 +0200 |
|---|---|---|
| committer | Guilhem Saurel | 2020-06-24 09:24:20 +0200 |
| commit | f8e813f50946b1b342a8917dcddc1828b47fd820 (patch) | |
| tree | 4eb0f9e96167006ef3e6134e18b9c24105cdf75a | |
| parent | f4d09ab0cab52e5f9d8a82e25715107a8ca640e5 (diff) | |
| download | aur-f8e813f50946b1b342a8917dcddc1828b47fd820.tar.gz | |
ignore patch
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 141.patch | 53 |
2 files changed, 1 insertions, 53 deletions
diff --git a/.gitignore b/.gitignore index f34a96c51ab9..4619b2435604 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pkg src +*.patch diff --git a/141.patch b/141.patch deleted file mode 100644 index 79712d765637..000000000000 --- a/141.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b9e828fea104e23bd52e936e15d51d2ce7f44fae Mon Sep 17 00:00:00 2001 -From: Steve Peters <scpeters@openrobotics.org> -Date: Wed, 27 May 2020 12:27:44 -0700 -Subject: [PATCH 1/2] Find console_bridge 1.0 if 0.3 is not found - -Signed-off-by: Steve Peters <scpeters@openrobotics.org> ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92762f1..87d0ce6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,10 @@ if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --find_package(console_bridge 0.3 REQUIRED) -+find_package(console_bridge 0.3 QUIET) -+if (NOT console_bridge_FOUND) -+ find_package(console_bridge 1.0 REQUIRED) -+endif() - include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) - link_directories(${console_bridge_LIBRARY_DIRS}) - - -From b18a97b4bb2767de29c014b5d84941f5adade29f Mon Sep 17 00:00:00 2001 -From: Steven Peters <scpeters@openrobotics.org> -Date: Wed, 27 May 2020 15:40:27 -0700 -Subject: [PATCH 2/2] just drop explicit version requirement - -Signed-off-by: Steve Peters <scpeters@openrobotics.org> ---- - CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 87d0ce6..f0d115d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,10 +41,7 @@ if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --find_package(console_bridge 0.3 QUIET) --if (NOT console_bridge_FOUND) -- find_package(console_bridge 1.0 REQUIRED) --endif() -+find_package(console_bridge REQUIRED) - include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) - link_directories(${console_bridge_LIBRARY_DIRS}) - |