Revision b3694223

View differences:

client/cpp/CMakeLists.txt
35 35
IF (IGNORE_RSB)
36 36
    MESSAGE(INFO "RSB disabled per command line flag IGNORE_RSB")
37 37
ELSE (IGNORE_RSB)
38
FIND_PACKAGE(RSB 0.11)
38
FIND_PACKAGE(RSB 0.11 QUIET)
39 39
IF (RSB_FOUND)
40 40
    #RSB
41 41
    SET(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
......
62 62

  
63 63
    message(STATUS "RSB Support is ON")
64 64
    add_definitions(-DRSB_SUPPORT=1)
65
ENDIF (RSB_FOUND)
65
ELSE(RSB_FOUND)
66
    message(STATUS "RSB not found.")
67
ENDIF(RSB_FOUND)
66 68
ENDIF(IGNORE_RSB)
67 69

  
68 70
################################################################
69 71
# check for ROS support:
70
find_package(catkin)
71
IF (catkin_FOUND)
72
find_package(catkin QUIET)
73
IF(catkin_FOUND)
72 74
    SET(ROS_FOUND 1)
73 75

  
74 76
    catkin_package(
......
81 83
    message(STATUS "ROS Support is ON")
82 84
    add_definitions(-DROS_SUPPORT=1)
83 85
    include_directories(${catkin_INCLUDE_DIRS})
84
ENDIF (catkin_FOUND)
86
ELSE(catkin_FOUND)
87
    message(STATUS "ROS not found.")
88
ENDIF(catkin_FOUND)
85 89

  
86 90
add_definitions ("-Wall")
87 91
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fstack-protector-all ")
......
91 95
find_package( Boost 1.46 REQUIRED COMPONENTS thread program_options system filesystem regex)
92 96
LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS}  )
93 97
include_directories(${Boost_INCLUDE_DIRS} )
94
message("-- using ${Boost_LIBRARIES}")
98
message(STATUS "using ${Boost_LIBRARIES}")
95 99

  
96 100
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/include)
97 101

  
......
172 176
#install(TARGETS ${PROJECT_NAME}_calibrate_camera DESTINATION bin)
173 177
ADD_EXECUTABLE(${PROJECT_NAME}_example_speech_test examples/speech_test/main.cpp)
174 178
TARGET_LINK_LIBRARIES(${PROJECT_NAME}_example_speech_test ${HLRC_CLIENT_LIBNAME})
175

  
176

  
server/CMakeLists.txt
19 19
IF (IGNORE_RSB) 
20 20
    MESSAGE(INFO "RSB disabled per command line flag IGNORE_RSB")
21 21
ELSE (IGNORE_RSB)
22
FIND_PACKAGE(RSB 0.11)
22
FIND_PACKAGE(RSB 0.11 QUIET)
23 23
IF (RSB_FOUND)
24 24
    #RSB
25 25
    SET(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
......
46 46

  
47 47
    message(STATUS "RSB Support is ON")
48 48
    add_definitions(-DRSB_SUPPORT=1)
49
ELSE(RSB_FOUND)
50
    message(STATUS "RSB not found.")
49 51
ENDIF (RSB_FOUND)
50 52
ENDIF(IGNORE_RSB)
51 53

  
52 54
################################################################
53 55
# check for ROS support:
54
find_package(catkin)
56
find_package(catkin QUIET)
55 57
IF (catkin_FOUND)
56 58
    SET(ROS_FOUND 1)
57 59

  
......
101 103
        #CATKIN_DEPENDS message_runtime
102 104
        #DEPENDS system_lib
103 105
    )
104
ENDIF (catkin_FOUND)
106
ELSE(catkin_FOUND)
107
    message(STATUS "ROS not found.")
108
ENDIF(catkin_FOUND)
105 109

  
106 110
add_definitions ("-Wall")
107 111

  
108 112
###################################
109 113
# humotion
110 114
INCLUDE(FindPkgConfig)
111
find_package(humotion 0.0.1)
112
IF (humotion_FOUND)
113
        message("> using humotion includes from " ${humotion_INCLUDE_DIRS})
114
ELSE (humotion_FOUND)
115
        message(FATAL_ERROR "> error: can not find libhumotion")
116
endif (humotion_FOUND)
115
find_package(humotion 0.0.1 REQUIRED)
116
message(STATUS "using humotion includes from " ${humotion_INCLUDE_DIRS})
117 117

  
118 118
###################################
119 119
# libao audio
120 120
PKG_CHECK_MODULES(AO REQUIRED ao>=1.1.0)
121
IF (AO_FOUND)
122
  SET(AO_LIBRARY_DIRS "${AO_PREFIX}/lib")
123
  SET(AO_INCLUDE_DIRS "${AO_PREFIX}/include")
124
  SET(AO_LIBRARIES "ao")
125
  MESSAGE("using libao version ${AO_VERSION} from ${AO_PREFIX}")
126
ELSE (AO_FOUND)
127
  message(FATAL_ERROR "Error: Cannot find libao")
128
ENDIF (AO_FOUND)
121
SET(AO_LIBRARY_DIRS "${AO_PREFIX}/lib")
122
SET(AO_INCLUDE_DIRS "${AO_PREFIX}/include")
123
SET(AO_LIBRARIES "ao")
124
MESSAGE(STATUS "using libao version ${AO_VERSION} from ${AO_PREFIX}")
129 125

  
130 126
#build 
131 127
include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS} ${AO_INCLUDE_DIRS} ${humotion_INCLUDE_DIRS})
server/src/Utterance.cpp
109 109
    //fetch active symbol:
110 110
    string symbol = ((symbol_duration_pair_t)*phonemes_vector_iterator).first;
111 111
    //printf("> active symbol = %s\n",symbol.c_str());
112
    if (DEBUG_PRINT_PHONEMES) printf("%s ",symbol.c_str()); fflush(stdout);
112
    if (DEBUG_PRINT_PHONEMES) { printf("%s ",symbol.c_str()); fflush(stdout); }
113 113

  
114 114
    return symbol;
115 115
}

Also available in: Unified diff