Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-fcl
Commits
26dfacfd
Commit
26dfacfd
authored
Apr 04, 2015
by
Jeongseok Lee
Browse files
Add prefix `FCL_` to build type definitions
parent
bf5a090f
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
26dfacfd
...
...
@@ -7,14 +7,14 @@ if (NOT CMAKE_BUILD_TYPE)
endif
()
# Set build type variable
set
(
BUILD_TYPE_RELEASE FALSE
)
set
(
BUILD_TYPE_DEBUG FALSE
)
set
(
FCL_
BUILD_TYPE_RELEASE FALSE
)
set
(
FCL_
BUILD_TYPE_DEBUG FALSE
)
string
(
TOUPPER
${
CMAKE_BUILD_TYPE
}
CMAKE_BUILD_TYPE_UPPERCASE
)
if
(
"
${
CMAKE_BUILD_TYPE_UPPERCASE
}
"
STREQUAL
"RELEASE"
)
set
(
BUILD_TYPE_RELEASE TRUE
)
set
(
FCL_
BUILD_TYPE_RELEASE TRUE
)
elseif
(
"
${
CMAKE_BUILD_TYPE_UPPERCASE
}
"
STREQUAL
"DEBUG"
)
set
(
BUILD_TYPE_DEBUG TRUE
)
set
(
FCL_
BUILD_TYPE_DEBUG TRUE
)
else
()
message
(
STATUS
"CMAKE_BUILD_TYPE
${
CMAKE_BUILD_TYPE
}
unknown. Valid options are: Debug Release"
)
endif
()
...
...
include/fcl/config.h.in
View file @
26dfacfd
...
...
@@ -45,7 +45,7 @@
#cmakedefine01 FCL_HAVE_FLANN
#cmakedefine01 FCL_HAVE_TINYXML
#cmakedefine01 BUILD_TYPE_DEBUG
#cmakedefine01 BUILD_TYPE_RELEASE
#cmakedefine01
FCL_
BUILD_TYPE_DEBUG
#cmakedefine01
FCL_
BUILD_TYPE_RELEASE
#endif
test/test_fcl_broadphase.cpp
View file @
26dfacfd
...
...
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(test_core_bf_broad_phase_self_distance)
/// check broad phase collision and self collision, only return collision or not
BOOST_AUTO_TEST_CASE
(
test_core_bf_broad_phase_collision_binary
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_collision_test
(
2000
,
10
,
100
,
1
,
false
);
broad_phase_collision_test
(
2000
,
100
,
100
,
1
,
false
);
broad_phase_collision_test
(
2000
,
10
,
100
,
1
,
true
);
...
...
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_update_collision_mesh_binary)
/// check broad phase update, in mesh, return 10 contacts
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_update_collision_mesh
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_update_collision_test
(
200
,
10
,
100
,
10
,
false
,
true
);
broad_phase_update_collision_test
(
200
,
100
,
100
,
10
,
false
,
true
);
#else
...
...
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_update_collision_mesh)
/// check broad phase update, in mesh, exhaustive
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_update_collision_mesh_exhaustive
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_update_collision_test
(
2000
,
10
,
100
,
1
,
true
,
true
);
broad_phase_update_collision_test
(
2000
,
100
,
100
,
1
,
true
,
true
);
#else
...
...
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_update_collision_mesh_exhaust
/// check broad phase distance
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_distance_mesh
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_distance_test
(
200
,
10
,
10
,
true
);
broad_phase_distance_test
(
200
,
100
,
10
,
true
);
broad_phase_distance_test
(
2000
,
10
,
10
,
true
);
...
...
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_self_distance_mesh)
/// check broad phase collision and self collision, return only collision or not, in mesh
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_collision_mesh_binary
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_collision_test
(
2000
,
10
,
100
,
1
,
false
,
true
);
broad_phase_collision_test
(
2000
,
100
,
100
,
1
,
false
,
true
);
#else
...
...
@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_collision_mesh_binary)
/// check broad phase collision and self collision, return 10 contacts, in mesh
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_collision_mesh
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_collision_test
(
2000
,
10
,
100
,
10
,
false
,
true
);
broad_phase_collision_test
(
2000
,
100
,
100
,
10
,
false
,
true
);
#else
...
...
@@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE(test_core_mesh_bf_broad_phase_collision_mesh)
/// check broad phase collision and self collision, exhaustive, in mesh
BOOST_AUTO_TEST_CASE
(
test_core_mesh_bf_broad_phase_collision_mesh_exhaustive
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
broad_phase_collision_test
(
2000
,
10
,
100
,
1
,
true
,
true
);
broad_phase_collision_test
(
2000
,
100
,
100
,
1
,
true
,
true
);
#else
...
...
test/test_fcl_octomap.cpp
View file @
26dfacfd
...
...
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(test_octomap_collision)
BOOST_AUTO_TEST_CASE
(
test_octomap_collision_mesh
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
octomap_collision_test
(
200
,
10
,
false
,
10
,
true
,
true
);
octomap_collision_test
(
200
,
100
,
false
,
10
,
true
,
true
);
octomap_collision_test
(
200
,
10
,
true
,
1
,
true
,
true
);
...
...
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(test_octomap_collision_mesh)
BOOST_AUTO_TEST_CASE
(
test_octomap_collision_mesh_octomap_box
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
octomap_collision_test
(
200
,
10
,
false
,
10
,
true
,
false
);
octomap_collision_test
(
200
,
100
,
false
,
10
,
true
,
false
);
octomap_collision_test
(
200
,
10
,
true
,
1
,
true
,
false
);
...
...
@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE(test_octomap_distance)
BOOST_AUTO_TEST_CASE
(
test_octomap_distance_mesh
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
octomap_distance_test
(
200
,
5
,
true
,
true
);
octomap_distance_test
(
200
,
50
,
true
,
true
);
#else
...
...
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE(test_octomap_distance_mesh)
BOOST_AUTO_TEST_CASE
(
test_octomap_distance_mesh_octomap_box
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
octomap_distance_test
(
200
,
10
,
true
,
false
);
octomap_distance_test
(
200
,
100
,
true
,
false
);
#else
...
...
@@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(test_octomap_bvh_obb_d_distance_obb)
BOOST_AUTO_TEST_CASE
(
test_octomap_bvh_kios_d_distance_kios
)
{
#ifdef BUILD_TYPE_DEBUG
#ifdef
FCL_
BUILD_TYPE_DEBUG
octomap_distance_test_BVH
<
kIOS
>
(
2
);
#else
octomap_distance_test_BVH
<
kIOS
>
(
5
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment