12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to workaround #158. (#160) 

Currently, on xenial/kinetic the transitive dependencies on
libcartographer and its dependencies are not duplicated after
each library that depends on it in the linker command.
master
Wolfgang Hess 2016-12-13 13:57:05 +01:00 committed by GitHub
parent efe700a9f3
commit ae490c540d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/functions.cmake
View File

@ -41,6 +41,10 @@ endmacro(_parse_arguments)
macro(_common_compile_stuff VISIBILITY) macro(_common_compile_stuff VISIBILITY)
set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}") set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
foreach(DEPENDENCY ${ARG_DEPENDS})
target_link_libraries("${NAME}" PUBLIC ${DEPENDENCY})
endforeach()
if(catkin_INCLUDE_DIRS) if(catkin_INCLUDE_DIRS)
target_include_directories("${NAME}" SYSTEM ${VISIBILITY} target_include_directories("${NAME}" SYSTEM ${VISIBILITY}
"${catkin_INCLUDE_DIRS}") "${catkin_INCLUDE_DIRS}")
@ -121,10 +125,6 @@ macro(_common_compile_stuff VISIBILITY)
target_include_directories("${NAME}" ${VISIBILITY} "${CMAKE_BINARY_DIR}") target_include_directories("${NAME}" ${VISIBILITY} "${CMAKE_BINARY_DIR}")
target_include_directories("${NAME}" ${VISIBILITY} "${CMAKE_SOURCE_DIR}") target_include_directories("${NAME}" ${VISIBILITY} "${CMAKE_SOURCE_DIR}")
foreach(DEPENDENCY ${ARG_DEPENDS})
target_link_libraries("${NAME}" PUBLIC ${DEPENDENCY})
endforeach()
# Figure out where to install the header. The logic goes like this: either # Figure out where to install the header. The logic goes like this: either
# the header is in the current binary directory (i.e. generated, like port.h) # the header is in the current binary directory (i.e. generated, like port.h)
# or in the current source directory - a regular header. It could also # or in the current source directory - a regular header. It could also