Skip to content
Snippets Groups Projects
Commit 87be4b4b authored by ydepledt's avatar ydepledt
Browse files

Merge branch 'devel' of...

Merge branch 'devel' of https://gitlab.iri.upc.edu/mobile_robotics/wolf_projects/wolf_lib/plugins/objectslam into devel
parents 2f4b1db2 2f58e143
No related branches found
No related tags found
No related merge requests found
...@@ -96,11 +96,11 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}") ...@@ -96,11 +96,11 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}")
message(FATAL_ERROR "Bug: Specified CONFIG_DIR: " message(FATAL_ERROR "Bug: Specified CONFIG_DIR: "
"${WOLF_CONFIG_DIR} exists, but is not a directory.") "${WOLF_CONFIG_DIR} exists, but is not a directory.")
ENDIF() ENDIF()
# Configure config.h
# Configure config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h")
#HEADERS # ============ HEADERS ============
SET(HDRS_CAPTURE SET(HDRS_CAPTURE
include/${PROJECT_NAME}/capture/capture_object.h include/${PROJECT_NAME}/capture/capture_object.h
) )
...@@ -128,8 +128,7 @@ SET(HDRS_UTILS ...@@ -128,8 +128,7 @@ SET(HDRS_UTILS
SET(HDRS_YAML SET(HDRS_YAML
) )
#SOURCES # ============ SOURCES ============
SET(SRCS_CAPTURE SET(SRCS_CAPTURE
src/capture/capture_object.cpp src/capture/capture_object.cpp
) )
...@@ -230,10 +229,6 @@ install( ...@@ -230,10 +229,6 @@ install(
${LIB_INSTALL_DIR}/${PLUGIN_NAME}/cmake ${LIB_INSTALL_DIR}/${PLUGIN_NAME}/cmake
) )
# Specifies include directories to use when compiling the plugin target
# This way, include_directories does not need to be called in plugins depending on this one
#
target_include_directories(${PLUGIN_NAME} PUBLIC target_include_directories(${PLUGIN_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/conf> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/conf>
......
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