Revision 21444915 CMakeLists.txt

View differences:

CMakeLists.txt
10 10
find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs message_generation genmsg)
11 11
IF (NOT catkin_FOUND)
12 12
  MESSAGE(FATAL_ERROR "Error: could not find ROS middleware!")
13
ENDIF (catkin_FOUND)
13
ENDIF (NOT catkin_FOUND)
14 14

  
15 15
INCLUDE(FindPkgConfig)
16 16

  
17 17
##libreflexxes
18
IF (libreflexxes_DIR)
19
  MESSAGE("using libreflexxes_DIR as override ('${libreflexxes_DIR}')")
20
  SET(REFLEXXES_PREFIX ${libreflexxes_DIR})
21
ELSE ()  
18
#IF (libreflexxes_DIR)
19
#  MESSAGE("using libreflexxes_DIR as override ('${libreflexxes_DIR}')")
20
#  SET(REFLEXXES_PREFIX ${libreflexxes_DIR})
21
#  SET(REFLEXXES_LIBRARY "ReflexxesTypeII")
22
#ELSE ()
22 23
  PKG_CHECK_MODULES(REFLEXXES REQUIRED libReflexxesTypeII>=1.2.3)
23 24
  IF (NOT REFLEXXES_FOUND)
24 25
    message(FATAL_ERROR "Error: could not find lib libReflexxesTypeII")
25 26
  ENDIF ()
26
ENDIF ()
27
#ENDIF ()
27 28

  
28 29

  
29 30
SET(REFLEXXES_LIBRARY_DIRS "${REFLEXXES_PREFIX}/lib")
......
80 81

  
81 82
## Specify additional locations of header files
82 83
## Your package locations should be listed before other locations
83
include_directories (BEFORE ${Boost_INCLUDE_DIRS} ${REFLEXXES_INCLUDE_DIRS})
84
include_directories(BEFORE ${Boost_INCLUDE_DIRS} ${REFLEXXES_INCLUDE_DIRS})
84 85
include_directories(BEFORE include)
85 86
include_directories(BEFORE include/humotion)
86 87
#make sure to use ros messages from current build

Also available in: Unified diff