Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-fcl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
hpp-fcl
Commits
6eaf2c99
Commit
6eaf2c99
authored
11 years ago
by
panjia1983
Browse files
Options
Downloads
Patches
Plain Diff
fix cmake bug
parent
aa6217db
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeModules/Findtinyxml.cmake
+1
-7
1 addition, 7 deletions
CMakeModules/Findtinyxml.cmake
test/CMakeLists.txt
+10
-1
10 additions, 1 deletion
test/CMakeLists.txt
with
11 additions
and
8 deletions
CMakeModules/Findtinyxml.cmake
+
1
−
7
View file @
6eaf2c99
...
...
@@ -6,11 +6,8 @@
# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
# TINYXML_LIBRARIES - List of libraries when using TinyXML.
#
INCLUDE
(
"FindPackageHandleStandardArgs"
)
IF
(
TINYXML_INCLUDE_DIRS
)
# Already in cache, be silent
SET
(
TinyXML_FIND_QUIETLY TRUE
)
ENDIF
(
TINYXML_INCLUDE_DIRS
)
FIND_PATH
(
TINYXML_INCLUDE_DIRS
"tinyxml.h"
PATH_SUFFIXES
"tinyxml"
)
...
...
@@ -21,7 +18,4 @@ PATH_SUFFIXES "tinyxml" )
# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE
(
"FindPackageHandleStandardArgs"
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
"TinyXML"
DEFAULT_MSG TINYXML_INCLUDE_DIRS TINYXML_LIBRARY_DIRS
)
MARK_AS_ADVANCED
(
TINYXML_INCLUDE_DIRS TINYXML_LIBRARY_DIRS
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
10
−
1
View file @
6eaf2c99
...
...
@@ -36,5 +36,14 @@ 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_executable
(
test_fcl_xmldata test_fcl_xmldata.cpp test_fcl_utility.cpp libsvm/svm.cpp
)
target_link_libraries
(
test_fcl_xmldata
fcl
${
TINYXML_LIBRARY_DIRS
}
${
Boost_SYSTEM_LIBRARY
}
${
Boost_THREAD_LIBRARY
}
${
Boost_DATE_TIME_LIBRARY
}
${
Boost_UNIT_TEST_FRAMEWORK_LIBRARY
}
)
add_test
(
test_fcl_xmldata
${
EXECUTABLE_OUTPUT_PATH
}
/test_fcl_xmldata
)
endif
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment