Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-rbprm-corba
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Humanoid Path Planner
hpp-rbprm-corba
Commits
f9ce388c
Commit
f9ce388c
authored
6 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[Cmake] update cmake module usage
parent
197ad257
No related branches found
Branches containing commit
Tags
v4.4.0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+4
-5
4 additions, 5 deletions
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
cmake2/FindCDD.cmake
+0
-25
0 additions, 25 deletions
cmake2/FindCDD.cmake
with
5 additions
and
31 deletions
CMakeLists.txt
+
4
−
5
View file @
f9ce388c
...
...
@@ -23,18 +23,17 @@ SET(CXX_DISABLE_WERROR true)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/idl.cmake
)
INCLUDE
(
cmake/python.cmake
)
INCLUDE
(
cmake/hpp.cmake
)
SET
(
PROJECT_ORG humanoid-path-planner
)
SET
(
PROJECT_NAME hpp-rbprm-corba
)
SET
(
PROJECT_DESCRIPTION
"Corba server for reachability based planning"
)
SET
(
PROJECT_URL
"https://github.com/
${
PROJECT_ORG
}
/
${
PROJECT_NAME
}
"
)
# Set to 1 for profiling
#add_definitions(-DPROFILE)
SET
(
CUSTOM_HEADER_DIR hpp/corbaserver/rbprm
)
SETUP_PROJECT
()
SETUP_
HPP_
PROJECT
()
SET
(
${
PROJECT_NAME
}
_HEADERS
include/hpp/corbaserver/rbprm/server.hh
...
...
@@ -53,7 +52,7 @@ 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
}
/cmake
2
"
)
set
(
CMAKE_MODULE_PATH
"
${
PROJECT_SOURCE_DIR
}
/cmake
/find-external/CDD
"
)
find_package
(
CDD REQUIRED
)
add_required_dependency
(
"octomap >= 1.8"
)
...
...
@@ -77,4 +76,4 @@ ADD_SUBDIRECTORY(src)
CONFIG_FILES
(
include/hpp/corbaserver/rbprm/doc.hh
)
SETUP_PROJECT_FINALIZE
()
SETUP_
HPP_
PROJECT_FINALIZE
()
This diff is collapsed.
Click to expand it.
cmake
@
5c8c19f4
Compare
320c6369
...
5c8c19f4
Subproject commit
320c636960b03b3bad7c7a08bd2e104951f42bc3
Subproject commit
5c8c19f491f2c6f8488f5f37ff81d711d69dbb3f
This diff is collapsed.
Click to expand it.
cmake2/FindCDD.cmake
deleted
100644 → 0
+
0
−
25
View file @
197ad257
# - 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
)
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