-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6627203
commit f644211
Showing
3 changed files
with
32 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/fetch_teleop/CMakeLists.txt b/fetch_teleop/CMakeLists.txt | ||
index 15ec263..74a4014 100644 | ||
--- a/fetch_teleop/CMakeLists.txt | ||
+++ b/fetch_teleop/CMakeLists.txt | ||
@@ -29,6 +29,10 @@ target_link_libraries(joystick_teleop | ||
${catkin_LIBRARIES} | ||
) | ||
|
||
+if(UNIX AND NOT APPLE) | ||
+ target_link_libraries(joystick_teleop rt) | ||
+endif() | ||
+ | ||
install( | ||
TARGETS joystick_teleop | ||
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index b73bd5b..ea1b825 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) | ||
project(robot_calibration) | ||
|
||
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) | ||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") | ||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall") | ||
endif() | ||
|
||
find_package(Boost REQUIRED system thread) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters