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

Reorder dependency linking to fix Kintetic. (#158)

master
Damon Kohler 2016-12-09 14:45:52 +01:00 committed by GitHub
parent 78747eda62
commit 78f5e2f088
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/functions.cmake
View File

@ -32,7 +32,7 @@ macro(_parse_arguments ARGS)
USES_PCL USES_PCL
USES_YAMLCPP USES_YAMLCPP
) )
set(ONE_VALUE_ARG ) set(ONE_VALUE_ARG)
set(MULTI_VALUE_ARGS SRCS HDRS DEPENDS) set(MULTI_VALUE_ARGS SRCS HDRS DEPENDS)
cmake_parse_arguments(ARG cmake_parse_arguments(ARG
"${OPTIONS}" "${ONE_VALUE_ARG}" "${MULTI_VALUE_ARGS}" ${ARGS}) "${OPTIONS}" "${ONE_VALUE_ARG}" "${MULTI_VALUE_ARGS}" ${ARGS})
@ -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} ${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} ${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
@ -133,7 +133,7 @@ macro(_common_compile_stuff VISIBILITY)
# e.g. foo/bar/baz.h.in will be installed from the binary directory as # e.g. foo/bar/baz.h.in will be installed from the binary directory as
# 'include/foo/bar/baz.h'. # 'include/foo/bar/baz.h'.
foreach(HDR ${ARG_HDRS}) foreach(HDR ${ARG_HDRS})
if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${HDR}) if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${HDR})
set(ABS_FIL "${CMAKE_CURRENT_BINARY_DIR}/${HDR}") set(ABS_FIL "${CMAKE_CURRENT_BINARY_DIR}/${HDR}")
file(RELATIVE_PATH REL_FIL ${CMAKE_BINARY_DIR} ${ABS_FIL}) file(RELATIVE_PATH REL_FIL ${CMAKE_BINARY_DIR} ${ABS_FIL})
elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HDR}) elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HDR})