[CMake] Export

CMakeLists.txt

-# Copyright (c) 2012 CNRS
-# Author: Florent Lamiraux
+# Copyright (c) 2012, 2020, CNRS
+# Authors: Florent Lamiraux, Guilhem Saurel
 #
 # This file is part of hpp-rbprm-corba.
 # hpp-rbprm-corba is free software: you can redistribute it
@@ -15,47 +15,35 @@
 # hpp-rbprm-corba.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-# Requires at least CMake 2.6 to configure the package.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 SET(PROJECT_NAME hpp-rbprm-corba)
 SET(PROJECT_DESCRIPTION "Corba server for reachability based planning")
 
+SET(CUSTOM_HEADER_DIR hpp/corbaserver/rbprm)
+SET(PROJECT_USE_CMAKE_EXPORT TRUE)
 SET(CXX_DISABLE_WERROR true)
 
 INCLUDE(cmake/hpp.cmake)
 INCLUDE(cmake/idl.cmake)
 INCLUDE(cmake/python.cmake)
 
-# Set to 1 for profiling
-#add_definitions(-DPROFILE)
-
-SET(CUSTOM_HEADER_DIR hpp/corbaserver/rbprm)
-
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 LIST(APPEND PKG_CONFIG_ADDITIONAL_VARIABLES cmake_plugin)
 
-SET(${PROJECT_NAME}_HEADERS
-  include/${CUSTOM_HEADER_DIR}/server.hh
-)
-
 FINDPYTHON()
 
-ADD_DOC_DEPENDENCY("hpp-core >= 4.3")
-ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4.3")
-ADD_REQUIRED_DEPENDENCY("hpp-rbprm >= 4.3")
+ADD_PROJECT_DEPENDENCY("hpp-rbprm" REQUIRED)
+ADD_PROJECT_DEPENDENCY("hpp-affordance-corba" REQUIRED)
 ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
-ADD_REQUIRED_DEPENDENCY("hpp-affordance-corba")
-ADD_REQUIRED_DEPENDENCY("hpp-util >= 3")
-ADD_REQUIRED_DEPENDENCY("hpp-pinocchio >= 4.3")
+ADD_REQUIRED_DEPENDENCY("octomap >= 1.8")
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
-find_package(CDD REQUIRED)
+ADD_PROJECT_DEPENDENCY(CDD REQUIRED)
 
-add_required_dependency("octomap >= 1.8")
-if (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
+if(OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
         include_directories(${OCTOMAP_INCLUDE_DIRS})
         link_directories(${OCTOMAP_LIBRARY_DIRS})
   string(REPLACE "." ";" VERSION_LIST ${OCTOMAP_VERSION})
@@ -70,8 +58,22 @@ else()
         message(STATUS "FCL does not use Octomap")
 endif()
 
-PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
+SET(${PROJECT_NAME}_HEADERS
+  include/${CUSTOM_HEADER_DIR}/server.hh
+  )
+
+SET(${PROJECT_NAME}_SOURCES
+  src/${PROJECT_NAME}.cc
+  )
+
+# Stand alone corba server
+ADD_EXECUTABLE(hpp-rbprm-server ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
+TARGET_INCLUDE_DIRECTORIES(hpp-rbprm-server PUBLIC $<INSTALL_INTERFACE:include>)
+TARGET_LINK_LIBRARIES(hpp-rbprm-server hpp-corbaserver::hpp-corbaserver)
+INSTALL(TARGETS hpp-rbprm-server EXPORT ${TARGETS_EXPORT_NAME} DESTINATION bin)
+
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)
 
 CONFIG_FILES (include/${CUSTOM_HEADER_DIR}/doc.hh)
+PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})

cmake @ 7ab756be

-Subproject commit 7eca9ee6c9d1c4ee20eb82272e94f9d11642053a
+Subproject commit 7ab756beff8729739c45731dfc1edb6f88d2dbc8

src/CMakeLists.txt

-# Copyright (c) 2012 CNRS
-# Author: Florent Lamiraux
+# Copyright (c) 2012, 2020, CNRS
+# Author: Florent Lamiraux, Guilhem Saurel
 #
 # This file is part of hpp-rbprm-corba.
 # hpp-rbprm-corba is free software: you can redistribute it
@@ -60,12 +60,12 @@ HPP_ADD_SERVER_PLUGIN(rbprm-corba
   rbprmbuilder.impl.hh
   server.cc
 
+  LINK_DEPENDENCIES
+  hpp-rbprm::hpp-rbprm
+  hpp-corbaserver::hpp-corbaserver
+
   PKG_CONFIG_DEPENDENCIES
-  hpp-rbprm
-  hpp-corbaserver
-  omniORB4
-  hpp-util
-  hpp-rbprm)
+  omniORB4)
 
 ADD_CUSTOM_TARGET(generate_idl_cpp DEPENDS ${ALL_IDL_CPP_STUBS})
 ADD_CUSTOM_TARGET(generate_idl_python DEPENDS ${ALL_IDL_PYTHON_STUBS})
@@ -73,14 +73,6 @@ ADD_DEPENDENCIES (rbprm-corba generate_idl_cpp)
 ADD_DEPENDENCIES (rbprm-corba generate_idl_python)
 TARGET_INCLUDE_DIRECTORIES(rbprm-corba PUBLIC ${CDD_INCLUDE_DIRS})
 
-# Stand alone corba server
-ADD_EXECUTABLE (hpp-rbprm-server hpp-rbprm-corba.cc)
-
-PKG_CONFIG_USE_DEPENDENCY(hpp-rbprm-server hpp-corbaserver)
-PKG_CONFIG_USE_DEPENDENCY(hpp-rbprm-server hpp-pinocchio)
-
-INSTALL (TARGETS hpp-rbprm-server DESTINATION ${CMAKE_INSTALL_BINDIR})
-
 SET(${PROJECT_NAME}_PYTHON_FILES
     __init__.py
     __main__.py
@@ -114,7 +106,7 @@ SET(${PROJECT_NAME}_PYTHON_TOOLS
     )
 
 SET(${PROJECT_NAME}_PYTHON_SCENARIOS
-    abstract_contact_generator.py 
+    abstract_contact_generator.py
     abstract_path_planner.py
     anymal_contact_generator.py
     anymal_path_planner.py
@@ -147,7 +139,7 @@ SET(${PROJECT_NAME}_PYTHON_SCENARIOS_DEMOS
     talos_navBauzil_obstacles.py
     talos_plateformes_path.py
     talos_plateformes.py
-    talos_stairs10_path.py 
+    talos_stairs10_path.py
     talos_stairs10.py
     )
 
@@ -184,12 +176,12 @@ SET(${PROJECT_NAME}_PYTHON_SCENARIOS_MEMMO
     talos_stairs10_random.py
     )
 
-# Install python files : 
+# Install python files :
 FOREACH(file ${${PROJECT_NAME}_PYTHON_FILES})
   PYTHON_INSTALL_ON_SITE("hpp/corbaserver/rbprm" ${file})
 ENDFOREACH(file ${${PROJECT_NAME}_PYTHON_FILES})
 
-# /tools 
+# /tools
 FOREACH(file ${${PROJECT_NAME}_PYTHON_TOOLS})
   PYTHON_INSTALL_ON_SITE("hpp/corbaserver/rbprm/tools" ${file})
 ENDFOREACH(file ${${PROJECT_NAME}_PYTHON_TOOLS})
@@ -208,8 +200,3 @@ ENDFOREACH(file ${${PROJECT_NAME}_PYTHON_SCENARIOS_DEMOS})
 FOREACH(file ${${PROJECT_NAME}_PYTHON_SCENARIOS_MEMMO})
   PYTHON_INSTALL_ON_SITE("hpp/corbaserver/rbprm/scenarios/memmo" ${file})
 ENDFOREACH(file ${${PROJECT_NAME}_PYTHON_SCENARIOS_MEMMO})
-
-
-
-
-