Compare commits
2 Commits
750dc94c61
...
75075a3498
| Author | SHA1 | Date | |
|---|---|---|---|
| 75075a3498 | |||
| 0c007fdab3 |
@@ -17,6 +17,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
|||||||
|
|
||||||
# Find dependencies
|
# Find dependencies
|
||||||
find_package(GTest REQUIRED)
|
find_package(GTest REQUIRED)
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
|
|
||||||
if (NOT BUILDING_WITH_CATKIN)
|
if (NOT BUILDING_WITH_CATKIN)
|
||||||
|
|
||||||
@@ -65,7 +66,9 @@ if(BUILDING_WITH_CATKIN)
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PUBLIC ${catkin_LIBRARIES}
|
PUBLIC
|
||||||
|
${catkin_LIBRARIES}
|
||||||
|
Threads::Threads
|
||||||
)
|
)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
@@ -76,6 +79,11 @@ else()
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
Threads::Threads
|
||||||
|
)
|
||||||
|
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
BUILD_RPATH "${CMAKE_BINARY_DIR}"
|
BUILD_RPATH "${CMAKE_BINARY_DIR}"
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
#ifndef ROBOT_WALL_TIMER_H
|
#ifndef ROBOT_WALL_TIMER_H
|
||||||
#define ROBOT_WALL_TIMER_H
|
#define ROBOT_WALL_TIMER_H
|
||||||
|
|
||||||
#include <robot/walltime.h>
|
#include <robot/time.h>
|
||||||
#include "robot_time_decl.h"
|
#include "robot_time_decl.h"
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|||||||
Reference in New Issue
Block a user