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
92aeca18
Commit
92aeca18
authored
Jan 03, 2013
by
Ioan Sucan
Browse files
check for libccd package name as well as ccd
parent
a52fdba7
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
92aeca18
...
...
@@ -62,8 +62,13 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
include_directories
(
BEFORE
"include"
)
if
(
PKG_CONFIG_FOUND
)
pkg_check_modules
(
CCD REQUIRED ccd
)
pkg_check_modules
(
CCD ccd
)
# check to see if the pkg is installed under the libccd name
if
(
NOT CCD_FOUND
)
pkg_check_modules
(
CCD libccd
)
endif
()
endif
()
if
(
NOT CCD_FOUND
)
# if pkfconfig is not installed, then fall back on more fragile detection
# of ccd
...
...
CMakeModules/FCLVersion.cmake
View file @
92aeca18
# set the version in a way CMake can use
set
(
FCL_MAJOR_VERSION 0
)
set
(
FCL_MINOR_VERSION 2
)
set
(
FCL_PATCH_VERSION
6
)
set
(
FCL_PATCH_VERSION
7
)
set
(
FCL_VERSION
"
${
FCL_MAJOR_VERSION
}
.
${
FCL_MINOR_VERSION
}
.
${
FCL_PATCH_VERSION
}
"
)
# increment this when we have ABI changes
...
...
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