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
30c5e1ad
Commit
30c5e1ad
authored
Jan 16, 2018
by
Justin Carpentier
Browse files
[CMake] Fix bug when OCTOMAP is not found
parent
af40b024
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
30c5e1ad
...
...
@@ -78,19 +78,19 @@ add_optional_dependency("octomap >= 1.6")
if
(
OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS
)
include_directories
(
${
OCTOMAP_INCLUDE_DIRS
}
)
link_directories
(
${
OCTOMAP_LIBRARY_DIRS
}
)
set
(
FCL_HAVE_OCTOMAP
1
)
string
(
REPLACE
"."
";"
VERSION_LIST
${
OCTOMAP_VERSION
}
)
list
(
GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION
)
list
(
GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION
)
list
(
GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION
)
add_definitions
(
-DOCTOMAP_MAJOR_VERSION=
${
OCTOMAP_MAJOR_VERSION
}
-DOCTOMAP_MINOR_VERSION=
${
OCTOMAP_MINOR_VERSION
}
-DOCTOMAP_PATCH_VERSION=
${
OCTOMAP_PATCH_VERSION
}
)
add_definitions
(
-D
FCL_HAVE_OCTOMAP
)
string
(
REPLACE
"."
";"
VERSION_LIST
${
OCTOMAP_VERSION
}
)
list
(
GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION
)
list
(
GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION
)
list
(
GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION
)
add_definitions
(
-DOCTOMAP_MAJOR_VERSION=
${
OCTOMAP_MAJOR_VERSION
}
-DOCTOMAP_MINOR_VERSION=
${
OCTOMAP_MINOR_VERSION
}
-DOCTOMAP_PATCH_VERSION=
${
OCTOMAP_PATCH_VERSION
}
)
message
(
STATUS
"FCL uses Octomap"
)
else
()
message
(
STATUS
"FCL does not use Octomap"
)
endif
()
add_definitions
(
-DFCL_HAVE_OCTOMAP=
${
FCL_HAVE_OCTOMAP
}
)
ADD_REQUIRED_DEPENDENCY
(
"assimp >= 2.0"
)
if
(
ASSIMP_FOUND
)
if
(
NOT
${
ASSIMP_VERSION
}
VERSION_LESS
"2.0.1150"
)
...
...
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