Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rtmbuild] fix include/link path for openhrp3 (by ishiguroJSK) #1106

Merged
merged 2 commits into from
Dec 23, 2021
Merged

[rtmbuild] fix include/link path for openhrp3 (by ishiguroJSK) #1106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1013a1
[rtmbuild] fix include/link path for openhrp3 (by ishiguroJSK)
Naoki-Hiraoka May 19, 2021
a8dfbe7
Merge branch 'master' into PR-rtmbuild
k-okada Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rtmbuild/cmake/rtmbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ macro(rtmbuild_init)
rosbuild_gensrv()
endif()

include_directories(${catkin_INCLUDE_DIRS} ${openrtm_aist_INCLUDE_DIRS} ${openhrp3_INCLUDE_DIRS})
include_directories( ${openhrp3_INCLUDE_DIRS} ${openrtm_aist_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
# since catkin > 0.7.0, the CPATH is no longer being set by catkin, so rtmbuild manually add them
set(_cmake_prefix_path_tmp $ENV{CMAKE_PREFIX_PATH})
string(REPLACE ":" ";" _cmake_prefix_path_tmp ${_cmake_prefix_path_tmp})
foreach(_cmake_prefix_path ${_cmake_prefix_path_tmp})
include_directories(${_cmake_prefix_path}/include)
endforeach()

link_directories(${catkin_LIBRARY_DIRS} ${openrtm_aist_LIBRARY_DIRS} ${openhrp3_LIBRARY_DIRS})
link_directories(${openhrp3_LIBRARY_DIRS} ${openrtm_aist_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS})

endmacro(rtmbuild_init)

Expand Down Expand Up @@ -308,7 +308,7 @@ macro(rtmbuild_add_executable exe)
set_target_properties(${exe} PROPERTIES COMPILE_FLAGS "-Wno-deprecated")
##
add_dependencies(${exe} RTMBUILD_${PROJECT_NAME}_genbridge ${${_package}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} )
target_link_libraries(${exe} ${catkin_LIBRARIES} ${openrtm_aist_LIBRARIES} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS} )
target_link_libraries(${exe} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS} ${openrtm_aist_LIBRARIES} ${catkin_LIBRARIES} )
endmacro(rtmbuild_add_executable)

macro(rtmbuild_add_library lib)
Expand All @@ -318,6 +318,6 @@ macro(rtmbuild_add_library lib)
else()
rosbuild_add_library(${ARGV})
endif()
target_link_libraries(${lib} ${openrtm_aist_LIBRARIES} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS})
target_link_libraries(${lib} ${openhrp3_LIBRARIES} ${openrtm_aist_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS})
endmacro(rtmbuild_add_library)