From aa6217db47926650cb045d774eff48588a6bcb4d Mon Sep 17 00:00:00 2001
From: panjia1983 <panjia1983@gmail.com>
Date: Thu, 15 Aug 2013 13:30:13 -0700
Subject: [PATCH] remove bug in cmake
---
test/CMakeLists.txt | 3 +--
test/test_fcl_simple.cpp | 1 -
test/test_fcl_xmldata.cpp | 3 ++-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7c8a1d04..3242bd24 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,6 @@ macro(add_fcl_test test_name)
add_executable(${ARGV})
target_link_libraries(${test_name}
fcl
- ${TINYXML_LIBRARY_DIRS}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
@@ -37,5 +36,5 @@ if (FCL_HAVE_OCTOMAP)
endif()
if (FCL_HAVE_TINYXML)
- add_fcl_test(test_fcl_xmldata test_fcl_xmldata.cpp test_fcl_utility.cpp libsvm/svm.cpp)
+# add_fcl_test(test_fcl_xmldata test_fcl_xmldata.cpp test_fcl_utility.cpp libsvm/svm.cpp)
endif()
diff --git a/test/test_fcl_simple.cpp b/test/test_fcl_simple.cpp
index fb863c4e..fb5d3314 100644
--- a/test/test_fcl_simple.cpp
+++ b/test/test_fcl_simple.cpp
@@ -5,7 +5,6 @@
#include "fcl/collision.h"
#include "fcl/BVH/BVH_model.h"
#include "fcl_resources/config.h"
-#include <tinyxml.h>
#include <boost/filesystem.hpp>
#include <sstream>
#include "fcl/math/vec_nf.h"
diff --git a/test/test_fcl_xmldata.cpp b/test/test_fcl_xmldata.cpp
index 2fb13d26..f4ffbf90 100644
--- a/test/test_fcl_xmldata.cpp
+++ b/test/test_fcl_xmldata.cpp
@@ -1,10 +1,11 @@
#define BOOST_TEST_MODULE "FCL_XMLDATA"
+#include <tinyxml.h>
+
#include <boost/test/unit_test.hpp>
#include "fcl/intersect.h"
#include "fcl/collision.h"
#include "fcl/BVH/BVH_model.h"
-#include <tinyxml.h>
#include <boost/filesystem.hpp>
#include <sstream>
--
GitLab