From f708628c2261310cf7ed9cfa24dd7737051b337d Mon Sep 17 00:00:00 2001 From: Tian jianyong <11429339@qq.com> Date: Fri, 20 Dec 2024 14:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20CollisionDetector.cpp=20?= =?UTF-8?q?=E5=92=8C=20CMakeLists.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 7 ++++++- src/detector/CollisionDetector.cpp | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9923b8e..d193018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,12 @@ set(Boost_NO_WARN_NEW_VERSIONS 1) set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) -find_package(Boost REQUIRED COMPONENTS system filesystem thread) +if(NOT APPLE) + # 在 CentOS 上使用 Boost 1.69 + set(BOOST_ROOT "/usr/include/boost169") + set(BOOST_LIBRARYDIR "/usr/lib64/boost169") +endif() +find_package(Boost 1.69.0 REQUIRED COMPONENTS system filesystem thread) # 添加 libcurl find_package(CURL REQUIRED) diff --git a/src/detector/CollisionDetector.cpp b/src/detector/CollisionDetector.cpp index 86f953f..19ae56c 100644 --- a/src/detector/CollisionDetector.cpp +++ b/src/detector/CollisionDetector.cpp @@ -3,7 +3,6 @@ #include "utils/Logger.h" #include "config/SystemConfig.h" #include -#include #include CollisionDetector::CollisionDetector(const AirportBounds& bounds, const ControllableVehicles& controllableVehicles)