diff --git a/shared_memory_interface/CMakeLists.txt b/shared_memory_interface/CMakeLists.txt index 55df503..bd54f3a 100644 --- a/shared_memory_interface/CMakeLists.txt +++ b/shared_memory_interface/CMakeLists.txt @@ -135,6 +135,25 @@ target_link_libraries(shared_memory_manager ${Boost_LIBRARIES} -lrt ) +install(TARGETS shared_memory_remover shared_memory_manager + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) + +install(DIRECTORY scripts + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} + PATTERN "scripts/*" + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ +) + +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.hpp" +) + + + ## Add cmake target dependencies of the executable/library ## as an example, message headers may need to be generated before nodes # add_dependencies(shared_memory_interface ros_shared_memory_interface_generate_messages_cpp) diff --git a/shared_memory_interface/include/shared_memory_interface/shared_memory_utils.hpp b/shared_memory_interface/include/shared_memory_interface/shared_memory_utils.hpp index 02e2e5d..9603068 100644 --- a/shared_memory_interface/include/shared_memory_interface/shared_memory_utils.hpp +++ b/shared_memory_interface/include/shared_memory_interface/shared_memory_utils.hpp @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -116,7 +117,7 @@ namespace shared_memory_interface { std::string shmmax_string; std::getline(shmmax_file_read, shmmax_string); - unsigned int shmmax = atof(shmmax_string.c_str()); + unsigned long long int shmmax = atof(shmmax_string.c_str()); shmmax_file_read.close(); if(shmmax < size) {