blob: 79712d7656370294e213ba6f641827ce21aa3ba2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
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})
|