Skip to content
Snippets Groups Projects
Commit 385b8a84 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Merge branch '2-cmake-remove-iri-algorithms-from-include-install-path' into 'devel'

Resolve "cmake: remove iri-algorithms from include install path"

Closes #2

See merge request !2
parents 0667cf4e 00e6cd56
No related branches found
No related tags found
1 merge request!2Resolve "cmake: remove iri-algorithms from include install path"
......@@ -13,7 +13,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
set(INCLUDE_INSTALL_DIR include/iri-algorithms/wolf)
set(INCLUDE_INSTALL_DIR include/wolf)
set(LIB_INSTALL_DIR lib/)
IF (NOT CMAKE_BUILD_TYPE)
......@@ -98,7 +98,7 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}")
ENDIF()
# Configure config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h "${WOLF_CONFIG_DIR}/config.h")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h")
message("CONFIG DIRECTORY ${PROJECT_BINARY_DIR}")
include_directories("${PROJECT_BINARY_DIR}/conf")
......@@ -108,22 +108,22 @@ include_directories(BEFORE "include")
#HEADERS
SET(HDRS_CAPTURE
include/objectslam/capture/capture_object.h
include/${PROJECT_NAME}/capture/capture_object.h
)
SET(HDRS_COMMON
)
SET(HDRS_FACTOR
)
SET(HDRS_FEATURE
include/objectslam/feature/feature_object.h
include/${PROJECT_NAME}/feature/feature_object.h
)
SET(HDRS_LANDMARK
include/objectslam/landmark/landmark_object.h
include/${PROJECT_NAME}/landmark/landmark_object.h
)
SET(HDRS_MATH
)
SET(HDRS_PROCESSOR
include/objectslam/processor/processor_tracker_landmark_object.h
include/${PROJECT_NAME}/processor/processor_tracker_landmark_object.h
)
SET(HDRS_SENSOR
)
......@@ -270,8 +270,6 @@ INSTALL(FILES ${HDRS_YAML}
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
export(PACKAGE ${PLUGIN_NAME})
FIND_PACKAGE(Doxygen MODULE)
......
File moved
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