diff --git a/CMakeLists.txt b/CMakeLists.txt index 364c8a7..0904788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ add_custom_target(fmt_headers catkin_package( INCLUDE_DIRS include ${fmt_HEADER_DEST} CATKIN_DEPENDS roscpp rosconsole - LIBRARIES rosfmt + LIBRARIES rosfmt7 ) include_directories( @@ -67,21 +67,21 @@ set_source_files_properties( PROPERTIES GENERATED TRUE ) -add_library(rosfmt +add_library(rosfmt7 ${fmt_HEADERS_OUT} ${fmt_SOURCE_DIR}/src/format.cc ${fmt_SOURCE_DIR}/src/os.cc src/rosfmt.cpp ) -target_link_libraries(rosfmt +target_link_libraries(rosfmt7 ${catkin_LIBRARIES} ) -add_dependencies(rosfmt fmt fmt_headers) +add_dependencies(rosfmt7 fmt fmt_headers) add_executable(simple_test test/test.cpp ) -target_link_libraries(simple_test rosfmt) +target_link_libraries(simple_test rosfmt7) install( DIRECTORY ${fmt_HEADER_DEST}/fmt/ @@ -92,6 +92,6 @@ install( DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} ) install( - TARGETS rosfmt + TARGETS rosfmt7 DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} )