Commit f9ce388c authored by Guilhem Saurel's avatar Guilhem Saurel

[Cmake] update cmake module usage

parent 197ad257
...@@ -23,18 +23,17 @@ SET(CXX_DISABLE_WERROR true) ...@@ -23,18 +23,17 @@ SET(CXX_DISABLE_WERROR true)
INCLUDE(cmake/base.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/idl.cmake) INCLUDE(cmake/idl.cmake)
INCLUDE(cmake/python.cmake) INCLUDE(cmake/python.cmake)
INCLUDE(cmake/hpp.cmake)
SET(PROJECT_ORG humanoid-path-planner)
SET(PROJECT_NAME hpp-rbprm-corba) SET(PROJECT_NAME hpp-rbprm-corba)
SET(PROJECT_DESCRIPTION "Corba server for reachability based planning") SET(PROJECT_DESCRIPTION "Corba server for reachability based planning")
SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
# Set to 1 for profiling # Set to 1 for profiling
#add_definitions(-DPROFILE) #add_definitions(-DPROFILE)
SET(CUSTOM_HEADER_DIR hpp/corbaserver/rbprm) SET(CUSTOM_HEADER_DIR hpp/corbaserver/rbprm)
SETUP_PROJECT () SETUP_HPP_PROJECT ()
SET(${PROJECT_NAME}_HEADERS SET(${PROJECT_NAME}_HEADERS
include/hpp/corbaserver/rbprm/server.hh include/hpp/corbaserver/rbprm/server.hh
...@@ -53,7 +52,7 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4") ...@@ -53,7 +52,7 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
ADD_REQUIRED_DEPENDENCY("hpp-affordance-corba") ADD_REQUIRED_DEPENDENCY("hpp-affordance-corba")
ADD_REQUIRED_DEPENDENCY("hpp-util >= 3") ADD_REQUIRED_DEPENDENCY("hpp-util >= 3")
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake2") set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
find_package(CDD REQUIRED) find_package(CDD REQUIRED)
add_required_dependency("octomap >= 1.8") add_required_dependency("octomap >= 1.8")
...@@ -77,4 +76,4 @@ ADD_SUBDIRECTORY(src) ...@@ -77,4 +76,4 @@ ADD_SUBDIRECTORY(src)
CONFIG_FILES (include/hpp/corbaserver/rbprm/doc.hh) CONFIG_FILES (include/hpp/corbaserver/rbprm/doc.hh)
SETUP_PROJECT_FINALIZE() SETUP_HPP_PROJECT_FINALIZE()
Subproject commit 320c636960b03b3bad7c7a08bd2e104951f42bc3 Subproject commit 5c8c19f491f2c6f8488f5f37ff81d711d69dbb3f
# - 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 )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment