Skip to content
Snippets Groups Projects
Commit c42209e1 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch '451-refactoring-wolf-installation-system' of...

Merge branch '451-refactoring-wolf-installation-system' of ssh://gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf into 451-refactoring-wolf-installation-system
parents 8d376011 83492dc3
No related branches found
No related tags found
2 merge requests!451After cmake and const refactor,!445Resolve "Refactoring WOLF installation system"
Pipeline #10081 failed
...@@ -20,8 +20,8 @@ PROJECT(core) ...@@ -20,8 +20,8 @@ PROJECT(core)
set(PLUGIN_NAME "wolf${PROJECT_NAME}") set(PLUGIN_NAME "wolf${PROJECT_NAME}")
# Paths # Paths
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)#FIXME: is this variable necessary?
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)#FIXME: is this variable necessary?
SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY FALSE) SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY FALSE)
SET(LIB_INSTALL_DIR lib) SET(LIB_INSTALL_DIR lib)
# plugin_core is not really needed, why was it used in the first place? # plugin_core is not really needed, why was it used in the first place?
...@@ -431,11 +431,11 @@ endif() ...@@ -431,11 +431,11 @@ endif()
#Link the created libraries #Link the created libraries
#============================================================= #=============================================================
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT} dl) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT} dl)
# TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} PUBLIC yaml-cpp)
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} yaml-cpp) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} PUBLIC Eigen3::Eigen)
IF (Ceres_FOUND) IF (Ceres_FOUND)
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} PUBLIC ceres)
ENDIF(Ceres_FOUND) ENDIF(Ceres_FOUND)
#Build tests #Build tests
...@@ -458,6 +458,8 @@ INSTALL(TARGETS ${PLUGIN_NAME} EXPORT ${PLUGIN_NAME}Targets ...@@ -458,6 +458,8 @@ INSTALL(TARGETS ${PLUGIN_NAME} EXPORT ${PLUGIN_NAME}Targets
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
)
install(EXPORT ${PLUGIN_NAME}Targets DESTINATION lib/${PLUGIN_NAME}/cmake)
# Configure the package installation # Configure the package installation
...@@ -476,7 +478,7 @@ install( ...@@ -476,7 +478,7 @@ install(
) )
install(EXPORT ${PLUGIN_NAME}Targets DESTINATION lib/cmake/${PLUGIN_NAME})
#install headers #install headers
INSTALL(FILES ${HDRS_CAPTURE} INSTALL(FILES ${HDRS_CAPTURE}
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/capture) DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/capture)
......
...@@ -8,4 +8,14 @@ set(@PLUGIN_NAME@_INCLUDE_DIRS @PLUGIN_NAME@_INCLUDE_DIR) ...@@ -8,4 +8,14 @@ set(@PLUGIN_NAME@_INCLUDE_DIRS @PLUGIN_NAME@_INCLUDE_DIR)
set_and_check(@PLUGIN_NAME@_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@") set_and_check(@PLUGIN_NAME@_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
set(@PLUGIN_NAME@_LIB_INSTALL_DIRS @PLUGIN_NAME@_LIB_INSTALL_DIR) set(@PLUGIN_NAME@_LIB_INSTALL_DIRS @PLUGIN_NAME@_LIB_INSTALL_DIR)
# forwards the correct parameters given to FIND_DEPENDENCIES
include(CMakeFindDependencyMacro)
FIND_DEPENDENCY(Threads REQUIRED)
FIND_DEPENDENCY(Ceres REQUIRED)
FIND_DEPENDENCY(Eigen3 3.3 REQUIRED)
FIND_DEPENDENCY(yaml-cpp REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/wolfcoreTargets.cmake")
check_required_components(@PLUGIN_NAME@) check_required_components(@PLUGIN_NAME@)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment