Skip to content

Commit

Permalink
rename rosfmt library to rosfmt7 to prevent ABI mismatches
Browse files Browse the repository at this point in the history
I'd like to use proper library versioning, but that doesn't play well
with catkin (see ros/catkin#1126).
  • Loading branch information
xqms committed Dec 3, 2020
1 parent 0794912 commit df30b53
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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/
Expand All @@ -92,6 +92,6 @@ install(
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)
install(
TARGETS rosfmt
TARGETS rosfmt7
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

0 comments on commit df30b53

Please sign in to comment.