Reorder dependency linking to fix Kintetic. (#158)
parent
78747eda62
commit
78f5e2f088
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue