Skip to content

ssmライブラリパスを定義する際にディレクトリ存在チェックを追加 #1221

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

Merged
n-ando merged 1 commit into from
May 11, 2026
Merged

ssmライブラリパスを定義する際にディレクトリ存在チェックを追加 #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ elseif(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --param max-inline-insns-single=1000 --param inline-unit-growth=1000 --param large-function-growth=2000")
endif()
endif()
if(SSM_ROOT)
if(IS_DIRECTORY "${SSM_ROOT}/lib64")
set(SSM_LIB_PATH "${SSM_ROOT}/lib64")
else()
set(SSM_LIB_PATH "${SSM_ROOT}/lib")
endif()
endif()
else()
set(INSTALL_RTM_SCRIPT_DIR lib/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/py_helper)
set(INSTALL_RTM_BIN_DIR bin)
Expand All @@ -141,6 +148,13 @@ else()
set(INSTALL_RTM_CMAKE_DIR lib/openrtm-${RTM_MAJOR_VERSION}.${RTM_MINOR_VERSION}/cmake)
set(INSTALL_RTM_ETC_DIR etc)
set(INSTALL_RTM_SHARE_DIR share)
if(SSM_ROOT)
if(IS_DIRECTORY "${SSM_ROOT}/lib64")
set(SSM_LIB_PATH "${SSM_ROOT}/lib64")
else()
set(SSM_LIB_PATH "${SSM_ROOT}/lib")
endif()
endif()
endif(MSVC)

set(HTTP_ENABLE FALSE CACHE BOOL "set HTTP_ENABLE")
Expand Down
3 changes: 2 additions & 1 deletion packages/deb/debian/rules.ros2-only-support.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ INSTALL_PREFIX = @CMAKE_INSTALL_PREFIX@
RTM_LIB_DIR=@INSTALL_RTM_LIB_DIR@
RTM_EXT_DIR=@INSTALL_RTM_EXT_DIR@
ROS2TRANSPORT_CMAKE_DIR=@INSTALL_ROS2TRANSPORT_CMAKE_DIR@
SSM_LIB_DIR=@SSM_LIB_PATH@

# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
Expand Down Expand Up @@ -158,7 +159,7 @@ install-arch:
(mkdir -p $(TARGET_ssm)/etc/transport)
(cp $(INSTALL_PREFIX)/etc/transport/rtc.ssm.conf $(TARGET_ssm)/etc/transport)
(mkdir -p $(TARGET_ssm)/${RTM_LIB_DIR})
(cp -a /usr/local/lib64/libssm.so* $(TARGET_ssm)/${RTM_LIB_DIR})
(cp -a ${SSM_LIB_DIR}/libssm.so* $(TARGET_ssm)/${RTM_LIB_DIR})
(mkdir -p $(TARGET_ssm)/bin)
(cp -r /usr/local/bin/*ssm* $(TARGET_ssm)/bin)

Expand Down
4 changes: 2 additions & 2 deletions src/ext/transport/SSMTransport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ set(SSM_ROOT ${SSM_ROOT} CACHE PATH "set SSM_ROOT")


if(SSM_ROOT)
link_directories(${SSM_ROOT}/lib ${SSM_ROOT}/lib64)
set(SSM_LIBRARY "-Wl,--whole-archive" "${SSM_ROOT}/lib64/libssm.a" "-Wl,--no-whole-archive")
link_directories(${SSM_LIB_PATH})
set(SSM_LIBRARY "-Wl,--whole-archive" "${SSM_LIB_PATH}/libssm.a" "-Wl,--no-whole-archive")
endif()

if(WIN32)
Expand Down
Loading