← Back to branch summary

~shadowrobot/sr-ros-interface/new_tactile_test

« back to all changes in this revision

Viewing changes to sr_movements/CMakeLists.txt

  • Committer: Ugo Cupcic
  • Date: 2012-02-10 09:13:40 UTC
  • mto: This revision was merged to the branch mainline in revision 328.
  • Revision ID: ugo@shadowrobot.com-20120210091340-8vq03jspfvmg4q1j
using imagemagick instead of libpng++ for sr_movements. This ensures a better compatibility with the different OSes as it comes by default in most distrib

Show diffs side-by-side

added added

removed removed

Lines of Context:
sr_movements/CMakeLists.txt
16
16
#set the default path for built libraries to the "lib" directory
17
17
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
18
18
 
 
19
find_package(ImageMagick COMPONENTS Magick++ REQUIRED)
 
20
include_directories( ${ImageMagick_INCLUDE_DIRS})
 
21
 
19
22
rosbuild_add_executable(sr_movements src/sr_movements.cpp src/movement_from_image.cpp src/partial_movement.cpp src/movement_publisher.cpp)
20
 
rosbuild_add_compile_flags(sr_movements -I/usr/include/libpng12)
21
 
rosbuild_add_link_flags(sr_movements -L/usr/lib -lpng12)
 
23
target_link_libraries(sr_movements ${ImageMagick_LIBRARIES})
22
24
 
23
25
rosbuild_add_library(sr_movement src/movement_from_image.cpp src/partial_movement.cpp src/movement_publisher.cpp)
24
 
rosbuild_add_compile_flags(sr_movement -I/usr/include/libpng12)
25
 
rosbuild_add_link_flags(sr_movement -L/usr/lib -lpng12)
 
 
b'\\ No newline at end of file'
 
26
target_link_libraries(sr_movement ${ImageMagick_LIBRARIES})
 
 
b'\\ No newline at end of file'