Merge pull request #96 from hannesbraun/cmake-boost

CMake: improve linking against Boost
rcsoccersim · Oct 29, 2022 · 97ce96d · 97ce96d
2 parents b8bf58f + a161b46
commit 97ce96d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/rcss/CMakeLists.txt b/rcss/CMakeLists.txt
@@ -25,8 +25,6 @@ target_include_directories(RCSSBase
 
 target_link_libraries(RCSSBase
   INTERFACE
-    Boost::boost
-    Boost::system
     Boost::filesystem
 )
 

diff --git a/rcss/conf/CMakeLists.txt b/rcss/conf/CMakeLists.txt
@@ -10,6 +10,8 @@ add_library(RCSS::ConfParser ALIAS RCSSConfParser)
 
 target_link_libraries(RCSSConfParser
   PUBLIC
+    Boost::filesystem
+  PRIVATE
     Boost::boost
 )
 

diff --git a/rcss/gzip/CMakeLists.txt b/rcss/gzip/CMakeLists.txt
@@ -4,11 +4,6 @@ add_library(RCSSGZ SHARED
 )
 add_library(RCSS::GZ ALIAS RCSSGZ)
 
-target_link_libraries(RCSSGZ
-  PUBLIC
-    Boost::boost
-)
-
 target_compile_definitions(RCSSGZ
   PUBLIC
     HAVE_CONFIG_H

diff --git a/rcss/net/CMakeLists.txt b/rcss/net/CMakeLists.txt
@@ -10,11 +10,6 @@ add_library(RCSSNet SHARED
 )
 add_library(RCSS::Net ALIAS RCSSNet)
 
-target_link_libraries(RCSSNet
-  PUBLIC
-    Boost::boost
-)
-
 target_compile_definitions(RCSSNet
   PUBLIC
     HAVE_CONFIG_H

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -92,9 +92,7 @@ target_link_libraries(RCSSServer
     RCSS::ConfParser
     RCSS::Net
     RCSS::GZ
-    Boost::boost
     Boost::filesystem
-    Boost::system
     ZLIB::ZLIB
 	)
 
@@ -123,9 +121,6 @@ target_link_libraries(RCSSClient
   PRIVATE
     RCSS::Net
     RCSS::GZ
-    Boost::boost
-    Boost::filesystem
-    Boost::system
     ZLIB::ZLIB
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,8 @@ add_library(RCSS::ConfParser ALIAS RCSSConfParser) @@
     target_link_libraries(RCSSConfParser
       PUBLIC
+        Boost::filesystem
+      PRIVATE
         Boost::boost
     )
@@ Expand Down @@