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
Jason Chemin
hpp-rbprm-corba
Commits
39620c23
Commit
39620c23
authored
Jan 31, 2019
by
Guilhem Saurel
Browse files
[CMake] find CDD
parent
477c1a14
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
39620c23
...
...
@@ -53,6 +53,9 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
ADD_REQUIRED_DEPENDENCY
(
"hpp-affordance-corba"
)
ADD_REQUIRED_DEPENDENCY
(
"hpp-util >= 3"
)
set
(
CMAKE_MODULE_PATH
"
${
PROJECT_SOURCE_DIR
}
/cmake2"
)
find_package
(
CDD REQUIRED
)
add_required_dependency
(
"octomap >= 1.8"
)
if
(
OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS
)
include_directories
(
${
OCTOMAP_INCLUDE_DIRS
}
)
...
...
cmake2/FindCDD.cmake
0 → 100644
View file @
39620c23
# - Try to find libcdd
# Once done this will define
# CDD_FOUND - System has CDD
# CDD_INCLUDE_DIRS - The CDD include directories
# CDD_LIBRARIES - The libraries needed to use CDD
# CDD_DEFINITIONS - Compiler switches required for using CDD
find_path
(
CDD_INCLUDE_DIR cdd.h
HINTS
${
CDD_INCLUDEDIR
}
/usr/include /usr/include/cdd /usr/include/cddlib
PATH_SUFFIXES CDD
)
find_library
(
CDD_LIBRARY NAMES libcdd.so
HINTS
${
CDD_LIBDIR
}
${
CDD_LIBRARY_DIRS
}
/usr/lib/libcdd.so
)
set
(
CDD_LIBRARIES
${
CDD_LIBRARY
}
)
set
(
CDD_INCLUDE_DIRS
${
CDD_INCLUDE_DIR
}
)
include
(
FindPackageHandleStandardArgs
)
# handle the QUIETLY and REQUIRED arguments and set CDD_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args
(
CDD DEFAULT_MSG
CDD_LIBRARY CDD_INCLUDE_DIR
)
mark_as_advanced
(
CDD_INCLUDE_DIR CDD_LIBRARY
)
src/CMakeLists.txt
View file @
39620c23
...
...
@@ -82,6 +82,7 @@ ADD_CUSTOM_TARGET(generate_idl_cpp DEPENDS ${ALL_IDL_CPP_STUBS})
ADD_CUSTOM_TARGET
(
generate_idl_python DEPENDS
${
ALL_IDL_PYTHON_STUBS
}
)
ADD_DEPENDENCIES
(
${
LIBRARY_NAME
}
generate_idl_cpp
)
ADD_DEPENDENCIES
(
${
LIBRARY_NAME
}
generate_idl_python
)
TARGET_INCLUDE_DIRECTORIES
(
${
LIBRARY_NAME
}
PUBLIC
${
CDD_INCLUDE_DIRS
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
LIBRARY_NAME
}
hpp-rbprm
)
PKG_CONFIG_USE_DEPENDENCY
(
${
LIBRARY_NAME
}
hpp-corbaserver
)
...
...
@@ -123,5 +124,4 @@ INSTALL(
ADD_EXECUTABLE
(
hpp-rbprm-server hpp-rbprm-corba.cc
)
TARGET_LINK_LIBRARIES
(
hpp-rbprm-server
${
LIBRARY_NAME
}
hpp-rbprm
)
INSTALL
(
TARGETS hpp-rbprm-server DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
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