Revision fc4357ee

View differences:

client/cpp/CMakeLists.txt
1
SET( PROJECT_NAME hlrc_client_cpp )
2
PROJECT( ${PROJECT_NAME} )
1
PROJECT(hlrc_client_cpp)
2

  
3
if(NOT "${CMAKE_CXX_STANDARD}")
4
  set(CMAKE_CXX_STANDARD 11)
5
endif()
6
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7
set(CMAKE_CXX_EXTENSIONS OFF)
3 8

  
4 9
#debug?
5 10
set(CMAKE_BUILD_TYPE Debug)
......
92 97
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" )
93 98

  
94 99
#search for Boost
95
find_package( Boost 1.46 REQUIRED COMPONENTS thread program_options system filesystem regex)
100
find_package( Boost 1.46 REQUIRED COMPONENTS program_options filesystem regex)
96 101
LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS}  )
97 102
include_directories(${Boost_INCLUDE_DIRS} )
98 103
message(STATUS "using ${Boost_LIBRARIES}")
server/CMakeLists.txt
1 1
cmake_minimum_required(VERSION 2.8.3)
2 2
project(hlrc_server)
3 3

  
4
if(NOT "${CMAKE_CXX_STANDARD}")
5
  set(CMAKE_CXX_STANDARD 11)
6
endif()
7
set(CMAKE_CXX_STANDARD_REQUIRED ON)
8
set(CMAKE_CXX_EXTENSIONS OFF)
9

  
4 10
set(ENV{ROS_LANG_DISABLE} "genjava")
5 11

  
6 12
## System dependencies are found with CMake's conventions
......
8 14

  
9 15
INCLUDE(FindPkgConfig)
10 16

  
11
find_package(Boost REQUIRED COMPONENTS system thread)
12

  
13 17
#######################################
14 18
#allow forced disable of RSB
15 19
option(IGNORE_RSB "IGNORE_RSB" OFF)
16 20

  
17 21
#######################################
18 22
# check if we have RSB support:
19
IF (IGNORE_RSB) 
23
IF (IGNORE_RSB)
20 24
    MESSAGE(INFO "RSB disabled per command line flag IGNORE_RSB")
21 25
ELSE (IGNORE_RSB)
22 26
FIND_PACKAGE(RSB 0.11 QUIET)
......
123 127
SET(AO_LIBRARIES "ao")
124 128
MESSAGE(STATUS "using libao version ${AO_VERSION} from ${AO_PREFIX}")
125 129

  
126
#build 
127
include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS} ${AO_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS})
128
link_directories(${catkin_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${AO_LIBRARY_DIRS} ${humotion_LIBRARY_DIRS})
130
#build
131
include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS} ${AO_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS})
132
link_directories(${catkin_LIBRARY_DIRS} ${AO_LIBRARY_DIRS} ${humotion_LIBRARY_DIRS})
129 133

  
130 134
#build dummy list of header files
131 135
file(GLOB DUMMY_HEADER_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/*.h include/RSB/*.h include/ROS/*.h)
......
167 171
#    )
168 172

  
169 173
install(TARGETS ${PROJECT_NAME} DESTINATION bin)
170

  
171

  

Also available in: Unified diff