From 3154cd3ca778c151b9a8f8c7af71dcd7f9f55e09 Mon Sep 17 00:00:00 2001 From: sdlzx Date: Sat, 25 Sep 2021 13:44:03 +0800 Subject: [PATCH] Use prebuilt TinyXML2 --- src/pluginlib/CMakeLists.txt | 4 +--- src/rospack/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pluginlib/CMakeLists.txt b/src/pluginlib/CMakeLists.txt index c19c2f6..3e88204 100644 --- a/src/pluginlib/CMakeLists.txt +++ b/src/pluginlib/CMakeLists.txt @@ -4,9 +4,7 @@ project(pluginlib) find_package(catkin REQUIRED COMPONENTS class_loader rosconsole roslib cmake_modules) find_package(Boost REQUIRED COMPONENTS filesystem) -find_package(TinyXML2 REQUIRED -PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/install/tinyxml2/ -NO_DEFAULT_PATH) +find_package(TinyXML2 REQUIRED) catkin_package( INCLUDE_DIRS include diff --git a/src/rospack/CMakeLists.txt b/src/rospack/CMakeLists.txt index 71e025b..91dc79d 100644 --- a/src/rospack/CMakeLists.txt +++ b/src/rospack/CMakeLists.txt @@ -5,9 +5,7 @@ find_package(catkin REQUIRED COMPONENTS cmake_modules) find_package(Boost REQUIRED COMPONENTS filesystem program_options system) set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED) -find_package(TinyXML2 REQUIRED -PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/install/tinyxml2/ -NO_DEFAULT_PATH) +find_package(TinyXML2 REQUIRED) catkin_package( INCLUDE_DIRS include -- 2.31.1