Commit 5d9351eb authored by Daniel Müller's avatar Daniel Müller
Browse files

Fixed file name for python import

parent 55df791d
...@@ -2,15 +2,9 @@ cmake_minimum_required(VERSION 2.8.3) ...@@ -2,15 +2,9 @@ cmake_minimum_required(VERSION 2.8.3)
project(homer_robot_face) project(homer_robot_face)
find_package(catkin REQUIRED COMPONENTS #set cpp 14 standard
roscpp set(CMAKE_CXX_STANDARD 14)
roslib set(CMAKE_CXX_STANDARD_REQUIRED ON)
std_msgs
sensor_msgs
message_generation
image_transport
cv_bridge
)
#set the default path for built executables to the "bin" directory #set the default path for built executables to the "bin" directory
#INSTALL(CODE "FILE(MAKE_DIRECTORY \${ENV}\${CMAKE_INSTALL_PREFIX}${mydir})") #INSTALL(CODE "FILE(MAKE_DIRECTORY \${ENV}\${CMAKE_INSTALL_PREFIX}${mydir})")
...@@ -18,10 +12,6 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -18,10 +12,6 @@ find_package(catkin REQUIRED COMPONENTS
#set the default path for built libraries to the "lib" directory #set the default path for built libraries to the "lib" directory
#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
#set cpp 14 standard
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# Use OGRE from ROS # Use OGRE from ROS
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/share/OGRE/cmake/modules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/share/OGRE/cmake/modules)
...@@ -31,6 +21,18 @@ set(QT_USE_QTXML TRUE) ...@@ -31,6 +21,18 @@ set(QT_USE_QTXML TRUE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
find_package(catkin REQUIRED COMPONENTS
roscpp
rospy
roslib
std_msgs
sensor_msgs
message_generation
image_transport
cv_bridge
)
#for face output #for face output
find_package(OGRE REQUIRED COMPONENTS RenderSystem_GL) find_package(OGRE REQUIRED COMPONENTS RenderSystem_GL)
add_definitions( -DOGRE_PLUGIN_PATH="/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/OGRE-1.9.0") add_definitions( -DOGRE_PLUGIN_PATH="/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/OGRE-1.9.0")
...@@ -54,34 +56,6 @@ endif() ...@@ -54,34 +56,6 @@ endif()
#for resizing image #for resizing image
find_package(OpenCV REQUIRED) find_package(OpenCV REQUIRED)
add_message_files(
FILES
DisplayImage.msg
DisplayImageFile.msg
)
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
catkin_python_setup()
generate_messages(
DEPENDENCIES
std_msgs
sensor_msgs
)
###########
## Build ##
###########
#set build type
#set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_BUILD_TYPE Release)
## Specify additional locations of header files ## Specify additional locations of header files
## Your package locations should be listed before other locations ## Your package locations should be listed before other locations
...@@ -104,6 +78,57 @@ include_directories( ...@@ -104,6 +78,57 @@ include_directories(
) )
#include(${QT_USE_FILE}) #include(${QT_USE_FILE})
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
catkin_python_setup()
################################################
## Declare ROS messages, services and actions ##
################################################
## To declare and build messages, services or actions from within this
## package, follow these steps:
## * Let MSG_DEP_SET be the set of packages whose message types you use in
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependencies might have been
## pulled in transitively but can be declared for certainty nonetheless:
## * add a build_depend tag for "message_generation"
## * add a run_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## * add "message_runtime" and every package in MSG_DEP_SET to
## catkin_package(CATKIN_DEPENDS ...)
## * uncomment the add_*_files sections below as needed
## and list every .msg/.srv/.action file to be processed
## * uncomment the generate_messages entry below
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
add_message_files(
FILES
DisplayImage.msg
DisplayImageFile.msg
)
generate_messages(
DEPENDENCIES
std_msgs
sensor_msgs
)
###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if you package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
CATKIN_DEPENDS CATKIN_DEPENDS
roscpp roscpp
...@@ -112,6 +137,15 @@ catkin_package( ...@@ -112,6 +137,15 @@ catkin_package(
sensor_msgs sensor_msgs
) )
###########
## Build ##
###########
#set build type
#set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_BUILD_TYPE Release)
## Declare source files ## Declare source files
set(RobotFace_SRC set(RobotFace_SRC
src/main.cpp src/main.cpp
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<run_depend>qtbase5-dev</run_depend> <run_depend>qtbase5-dev</run_depend>
<run_depend>libqt5x11extras5-dev</run_depend> <run_depend>libqt5x11extras5-dev</run_depend>
<run_depend>roscpp</run_depend> <run_depend>roscpp</run_depend>
<run_depend>rospy</run_depend>
<run_depend>roscpp_serialization</run_depend> <run_depend>roscpp_serialization</run_depend>
<run_depend>roslib</run_depend> <run_depend>roslib</run_depend>
<run_depend>sensor_msgs</run_depend> <run_depend>sensor_msgs</run_depend>
......
File mode changed from 100644 to 100755
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment