blob: 957dd59e77afb5e7a2eb0c011bf0d10801f05da1 (
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
54
55
56
57
58
59
60
|
diff -aur serial-1.2.1.pristine/CMakeLists.txt serial-1.2.1.new/CMakeLists.txt
--- serial-1.2.1.pristine/CMakeLists.txt 2016-02-18 23:09:09.037989467 +0100
+++ serial-1.2.1.new/CMakeLists.txt 2016-02-19 01:19:59.568329056 +0100
@@ -2,26 +2,34 @@
project(serial)
# Find catkin
-find_package(catkin REQUIRED)
+option(BUILD_WITH_CATKIN "Build using catkin" OFF)
+if(BUILD_WITH_CATKIN)
+ find_package(catkin REQUIRED)
+endif()
if(APPLE)
find_library(IOKIT_LIBRARY IOKit)
find_library(FOUNDATION_LIBRARY Foundation)
endif()
-if(UNIX AND NOT APPLE)
- # If Linux, add rt and pthread
- catkin_package(
- LIBRARIES ${PROJECT_NAME}
- INCLUDE_DIRS include
- DEPENDS rt pthread
- )
+if(catkin_FOUND)
+ if(UNIX AND NOT APPLE)
+ # If Linux, add rt and pthread
+ catkin_package(
+ LIBRARIES ${PROJECT_NAME}
+ INCLUDE_DIRS include
+ DEPENDS rt pthread
+ )
+ else()
+ # Otherwise normal call
+ catkin_package(
+ LIBRARIES ${PROJECT_NAME}
+ INCLUDE_DIRS include
+ )
+ endif()
else()
- # Otherwise normal call
- catkin_package(
- LIBRARIES ${PROJECT_NAME}
- INCLUDE_DIRS include
- )
+ set(CATKIN_PACKAGE_LIB_DESTINATION lib)
+ set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
endif()
## Sources
@@ -45,7 +53,7 @@
endif()
## Add serial library
-add_library(${PROJECT_NAME} ${serial_SRCS})
+add_library(${PROJECT_NAME} SHARED ${serial_SRCS})
if(APPLE)
target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
elseif(UNIX)
|