Revision fe5a9426

View differences:

CMakeLists.txt
54 54 
IF (libreflexxes_DIR)
55 55 
  MESSAGE("using libreflexxes_DIR as override ('${libreflexxes_DIR}')")
56 56 
  SET(REFLEXXES_PREFIX ${libreflexxes_DIR})
57 
ELSE ()
57 
ELSE ()
58 58 
  PKG_CHECK_MODULES(REFLEXXES REQUIRED libReflexxesTypeII>=1.2.3)
59 59 
  IF (NOT REFLEXXES_FOUND)
60 60 
    message(FATAL_ERROR "Error: could not find lib libReflexxesTypeII")
61 61 
  ENDIF ()
62 
ENDIF()
62 
ENDIF ()
63 63 

  		




  64
  64
  
    
IF (NOT catkin_FOUND AND NOT RSB_FOUND)


  		




  65
  65
  
    
  message(FATAL_ERROR "Error: could neither find RSB or ROS middleware!")


  		




  ......




  68
  68
  
    

  		




  69
  69
  
    
SET(REFLEXXES_LIBRARY_DIRS "${REFLEXXES_PREFIX}/lib")


  		




  70
  70
  
    
SET(REFLEXXES_INCLUDE_DIRS "${REFLEXXES_PREFIX}/include")


  		




  71
  
  
    
MESSAGE("using libReflexxesTypeII version ${REFLEXXES_VERSION} from ${REFLEXXES_INCLUDE_DIRS} and ${REFLEXXES_LIBRARY_DIRS}")


  		




  
  71
  
    
#resolve to absolute library filename


  		




  
  72
  
    
#or is there an easier way to get the absolute lib filename from pkg config files?!


  		




  
  73
  
    
find_library(REFLEXXES_LIBRARY NAMES ${REFLEXXES_LIBRARIES} HINTS ${REFLEXXES_LIBRARY_DIRS})


  		




  
  74
  
    

  		




  
  75
  
    
MESSAGE("-- using libReflexxesTypeII version ${REFLEXXES_VERSION} from ${REFLEXXES_INCLUDE_DIRS} and ${REFLEXXES_LIBRARY_DIRS}")


  		




  
  76
  
    
MESSAGE("-- will ink against ${REFLEXXES_LIBRARY}")


  		




  72
  77
  
    

  		




  73
  78
  
    
set(CMAKE_CXX_FLAGS "-g -Wall")


  		




  74
  79
  
    
add_definitions ("-Wall")


  		




  ......




  121
  126
  
    
include_directories (BEFORE ${Boost_INCLUDE_DIRS} ${REFLEXXES_INCLUDE_DIRS})


  		




  122
  127
  
    
include_directories(include/humotion)


  		




  123
  128
  
    
include_directories( ${catkin_INCLUDE_DIRS})


  		




  124
  
  
    
link_directories (${Boost_LIBRARY_DIRS} ${REFLEXXES_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS})


  		




  
  129
  
    
#link_directories (${Boost_LIBRARY_DIRS} ${REFLEXXES_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS})


  		




  125
  130
  
    

  		




  126
  131
  
    

  		




  127
  132
  
    
#####################


  		




  ......




  169
  174
  
    
target_link_libraries(humotion


  		




  170
  175
  
    
			${Boost_LIBRARIES}


  		




  171
  176
  
    
			${catkin_LIBRARIES}


  		




  172
  
  
    
			${REFLEXXES_LIBRARIES}


  		




  
  177
  
    
			${REFLEXXES_LIBRARY}


  		




  173
  178
  
    
			${RST_LIBRARIES}


  		




  174
  179
  
    
			${RSB_LIBRARIES}


  		




  175
  180
  
    
)


  		












  

    
      package.xml
    
  





  31
  31
  
    
  <!-- Examples: -->


  		




  32
  32
  
    
  <!-- Use build_depend for packages you need at compile time: -->


  		




  33
  33
  
    
  <!-- <build_depend>message_generation</build_depend> -->


  		




  34
  
  
    
  <build_depend></build_depend>


  		




  35
  
  
    
  <run_depend></run_depend>


  		




  36
  34
  
    
  <!-- Use buildtool_depend for build tool packages: -->


  		




  37
  35
  
    
  <!--   <buildtool_depend>catkin</buildtool_depend> -->


  		




  38
  36
  
    
  <!-- Use run_depend for packages you need at runtime: -->


  		












Also available in:  Unified diff