Commit 0ef0e121 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

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

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

Closes #23

See merge request !37
parents 2d4022b5 46d68c36
......@@ -30,7 +30,6 @@ src/examples/map_polyline_example_write.yaml
src/CMakeCache.txt
src/CMakeFiles/cmake.check_cache
vision.found
\.vscode/
doc/html
......@@ -13,7 +13,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
# Paths
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)
......@@ -111,31 +111,31 @@ INCLUDE_DIRECTORIES(BEFORE "include")
# ============ HEADERS ============
SET(HDRS_CAPTURE
include/vision/capture/capture_image.h
include/${PROJECT_NAME}/capture/capture_image.h
)
SET(HDRS_FACTOR
# include/vision/factor/factor_trifocal.h
# include/vision/factor/factor_ahp.h
include/vision/factor/factor_pixel_hp.h
# include/vision/factor/factor_epipolar.h
# include/${PROJECT_NAME}/factor/factor_trifocal.h
# include/${PROJECT_NAME}/factor/factor_ahp.h
include/${PROJECT_NAME}/factor/factor_pixel_hp.h
# include/${PROJECT_NAME}/factor/factor_epipolar.h
)
SET(HDRS_FEATURE
include/vision/feature/feature_point_image.h
include/${PROJECT_NAME}/feature/feature_point_image.h
)
SET(HDRS_LANDMARK
# include/vision/landmark/landmark_ahp.h
include/vision/landmark/landmark_hp.h
include/vision/landmark/landmark_point_3d.h
# include/${PROJECT_NAME}/landmark/landmark_ahp.h
include/${PROJECT_NAME}/landmark/landmark_hp.h
include/${PROJECT_NAME}/landmark/landmark_point_3d.h
)
SET(HDRS_MATH
include/vision/math/pinhole_tools.h
include/${PROJECT_NAME}/math/pinhole_tools.h
)
SET(HDRS_PROCESSOR
include/vision/processor/processor_visual_odometry.h
include/vision/processor/active_search.h
include/${PROJECT_NAME}/processor/processor_visual_odometry.h
include/${PROJECT_NAME}/processor/active_search.h
)
SET(HDRS_SENSOR
include/vision/sensor/sensor_camera.h
include/${PROJECT_NAME}/sensor/sensor_camera.h
)
# ============ SOURCES ============
......@@ -265,8 +265,6 @@ INSTALL(FILES ${HDRS_SENSOR}
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)
......
Supports Markdown
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