From 4d2cfed7f2a908d5a46ff9bd6eb99884ba9c5dfd Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:29:10 +0100 Subject: [PATCH 1/7] [roscpp] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- clients/roscpp/package.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clients/roscpp/package.xml b/clients/roscpp/package.xml index 244d6a2ba3..e3bf588e4e 100644 --- a/clients/roscpp/package.xml +++ b/clients/roscpp/package.xml @@ -24,6 +24,9 @@ catkin cpp_common + libboost-chrono-dev + libboost-filesystem-dev + libboost-system-dev message_generation pkg-config rosconsole @@ -37,6 +40,9 @@ cpp_common message_runtime + libboost-chrono-dev + libboost-filesystem-dev + libboost-system-dev rosconsole roscpp_serialization roscpp_traits From cb9ee174441ae046843f3c988f2ce69327e6617e Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:32:57 +0100 Subject: [PATCH 2/7] [rosbag] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- tools/rosbag/CMakeLists.txt | 2 +- tools/rosbag/package.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/rosbag/CMakeLists.txt b/tools/rosbag/CMakeLists.txt index 4fa8ff90d4..88978d00a9 100644 --- a/tools/rosbag/CMakeLists.txt +++ b/tools/rosbag/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT WIN32) endif() find_package(catkin REQUIRED COMPONENTS rosbag_storage rosconsole roscpp std_srvs topic_tools xmlrpcpp) -find_package(Boost REQUIRED COMPONENTS date_time regex program_options filesystem) +find_package(Boost REQUIRED COMPONENTS date_time filesystem program_options regex thread) find_package(BZip2 REQUIRED) catkin_python_setup() diff --git a/tools/rosbag/package.xml b/tools/rosbag/package.xml index 836eba113c..fce0377d93 100644 --- a/tools/rosbag/package.xml +++ b/tools/rosbag/package.xml @@ -20,7 +20,11 @@ Jeremy Leibs James Bowman - boost + libboost-date-time-dev + libboost-filesystem-dev + libboost-program-options-dev + libboost-regex-dev + libboost-thread-dev rosbag_storage rosconsole roscpp From 5cc6b76266d84a5e76f063566486711eade09336 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:37:37 +0100 Subject: [PATCH 3/7] [rosbag_storage] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- tools/rosbag_storage/CMakeLists.txt | 2 +- tools/rosbag_storage/package.xml | 4 ++-- tools/rosbag_storage/test/test_aes_encryptor.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/rosbag_storage/CMakeLists.txt b/tools/rosbag_storage/CMakeLists.txt index 0fd724d736..e0e077a15d 100644 --- a/tools/rosbag_storage/CMakeLists.txt +++ b/tools/rosbag_storage/CMakeLists.txt @@ -8,7 +8,7 @@ endif() find_package(console_bridge REQUIRED) find_package(catkin REQUIRED COMPONENTS cpp_common pluginlib roscpp_serialization roscpp_traits rostime roslz4 std_msgs) -find_package(Boost REQUIRED COMPONENTS date_time filesystem program_options regex) +find_package(Boost REQUIRED COMPONENTS filesystem) find_package(BZip2 REQUIRED) catkin_package( diff --git a/tools/rosbag_storage/package.xml b/tools/rosbag_storage/package.xml index 2c58a4ab0e..675a3ef542 100644 --- a/tools/rosbag_storage/package.xml +++ b/tools/rosbag_storage/package.xml @@ -10,9 +10,9 @@ catkin - boost bzip2 cpp_common + libboost-filesystem-dev libconsole-bridge-dev libgpgme-dev libssl-dev @@ -24,9 +24,9 @@ roslz4 std_msgs - boost bzip2 cpp_common + libboost-filesystem-dev libconsole-bridge-dev libgpgme-dev libssl-dev diff --git a/tools/rosbag_storage/test/test_aes_encryptor.cpp b/tools/rosbag_storage/test/test_aes_encryptor.cpp index 0a9c8abdb7..aac9540774 100644 --- a/tools/rosbag_storage/test/test_aes_encryptor.cpp +++ b/tools/rosbag_storage/test/test_aes_encryptor.cpp @@ -34,6 +34,8 @@ #include +#include + #include #include From a7a40967a4aab86904b05e4e04e7795a00308c7b Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:39:41 +0100 Subject: [PATCH 4/7] [rostest] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- tools/rostest/CMakeLists.txt | 2 +- tools/rostest/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/rostest/CMakeLists.txt b/tools/rostest/CMakeLists.txt index 04767e435c..b91b7e9393 100644 --- a/tools/rostest/CMakeLists.txt +++ b/tools/rostest/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) project(rostest) find_package(catkin COMPONENTS rosunit) -find_package(Boost COMPONENTS system thread) +find_package(Boost COMPONENTS thread) include_directories(include ${Boost_INCLUDE_DIRS}) diff --git a/tools/rostest/package.xml b/tools/rostest/package.xml index d2201a10ed..6e2cb94661 100644 --- a/tools/rostest/package.xml +++ b/tools/rostest/package.xml @@ -12,10 +12,10 @@ catkin - boost + libboost-thread-dev rosunit - boost + libboost-thread-dev rosgraph roslaunch rosmaster From af0a9fd56f14917fded31271017db568487c7e76 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:41:22 +0100 Subject: [PATCH 5/7] [xmlrpcpp] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- utilities/xmlrpcpp/package.xml | 2 +- utilities/xmlrpcpp/test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/xmlrpcpp/package.xml b/utilities/xmlrpcpp/package.xml index fdbfba0c2e..18d9594a1a 100644 --- a/utilities/xmlrpcpp/package.xml +++ b/utilities/xmlrpcpp/package.xml @@ -21,7 +21,7 @@ cpp_common rostime - boost + libboost-thread-dev diff --git a/utilities/xmlrpcpp/test/CMakeLists.txt b/utilities/xmlrpcpp/test/CMakeLists.txt index bde17ffd7a..069b6b5599 100644 --- a/utilities/xmlrpcpp/test/CMakeLists.txt +++ b/utilities/xmlrpcpp/test/CMakeLists.txt @@ -17,7 +17,7 @@ if(WIN32) endif() # Some of the tests that follow use boost threads. -find_package(Boost REQUIRED COMPONENTS system thread) +find_package(Boost REQUIRED COMPONENTS thread) include_directories(${Boost_INCLUDE_DIRS}) add_library(test_fixtures test_fixtures.cpp) From 319282356f75b7d968916cb9da2638a0f0cdc5ee Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 15:42:52 +0100 Subject: [PATCH 6/7] [message_filters] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- utilities/message_filters/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/message_filters/package.xml b/utilities/message_filters/package.xml index 36dbb377a7..d31cf1bfdf 100644 --- a/utilities/message_filters/package.xml +++ b/utilities/message_filters/package.xml @@ -14,7 +14,7 @@ catkin - boost + libboost-thread-dev rosconsole roscpp rostest From 54062df348e6cbc5785f4d12261cde7aed35b838 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Sun, 26 Jan 2020 16:31:43 +0100 Subject: [PATCH 7/7] [test_rosbag] declare specific boost dependencies Signed-off-by: Mikael Arguedas --- test/test_rosbag/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_rosbag/package.xml b/test/test_rosbag/package.xml index 4265a1867c..86df31c99a 100644 --- a/test/test_rosbag/package.xml +++ b/test/test_rosbag/package.xml @@ -23,7 +23,6 @@ catkin - boost bzip2 cpp_common message_generation @@ -39,6 +38,7 @@ genmsg genpy + libboost-dev message_runtime python-rospkg python3-rospkg