diff --git a/CMakeLists.txt b/CMakeLists.txt index bbec06c6c7d7de1ff2065b5cee79989a481db04e..31ef04c778c0ac2334521ef1dfe255b3baefcd05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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,32 +111,32 @@ INCLUDE_DIRECTORIES(BEFORE "include") # ============ HEADERS ============ SET(HDRS_CAPTURE - include/laser/capture/capture_laser_2d.h + include/${PROJECT_NAME}/capture/capture_laser_2d.h ) SET(HDRS_FACTOR - include/laser/factor/factor_point_2d.h - include/laser/factor/factor_point_to_line_2d.h + include/${PROJECT_NAME}/factor/factor_point_2d.h + include/${PROJECT_NAME}/factor/factor_point_to_line_2d.h ) SET(HDRS_FEATURE - include/laser/feature/feature_polyline_2d.h - include/laser/feature/feature_match_polyline_2d.h + include/${PROJECT_NAME}/feature/feature_polyline_2d.h + include/${PROJECT_NAME}/feature/feature_match_polyline_2d.h ) SET(HDRS_LANDMARK - include/laser/landmark/landmark_polyline_2d.h - include/laser/landmark/landmark_match_polyline_2d.h + include/${PROJECT_NAME}/landmark/landmark_polyline_2d.h + include/${PROJECT_NAME}/landmark/landmark_match_polyline_2d.h ) SET(HDRS_MATH - include/laser/math/laser_tools.h + include/${PROJECT_NAME}/math/laser_tools.h ) SET(HDRS_PROCESSOR - include/laser/processor/polyline_2d_utils.h - include/laser/processor/processor_tracker_feature_polyline_2d.h + include/${PROJECT_NAME}/processor/polyline_2d_utils.h + include/${PROJECT_NAME}/processor/processor_tracker_feature_polyline_2d.h ) SET(HDRS_SENSOR - include/laser/sensor/sensor_laser_2d.h + include/${PROJECT_NAME}/sensor/sensor_laser_2d.h ) SET(HDRS_STATE_BLOCK - include/laser/state_block/local_parametrization_polyline_extreme.h + include/${PROJECT_NAME}/state_block/local_parametrization_polyline_extreme.h ) # ============ SOURCES ============ @@ -170,13 +170,13 @@ SET(SRCS_YAML if (falkolib_FOUND) message("Found Falkolib. Compiling some extra classes.") SET(HDRS_PROCESSOR ${HDRS_PROCESSOR} - include/laser/processor/processor_loop_closure_falko.h + include/${PROJECT_NAME}/processor/processor_loop_closure_falko.h ) SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} src/processor/processor_loop_closure_falko.cpp ) SET(HDRS_FEATURE ${HDRS_FEATURE} - include/laser/feature/feature_scene_falko.h + include/${PROJECT_NAME}/feature/feature_scene_falko.h ) SET(SRCS_FEATURE ${SRCS_FEATURE} src/feature/feature_scene_falko.cpp @@ -184,7 +184,7 @@ if (falkolib_FOUND) # falko & CSM if (csm_FOUND) SET(HDRS_PROCESSOR ${HDRS_PROCESSOR} - include/laser/processor/processor_loop_closure_falko_icp.h + include/${PROJECT_NAME}/processor/processor_loop_closure_falko_icp.h ) SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} src/processor/processor_loop_closure_falko_icp.cpp @@ -196,12 +196,12 @@ endif() if(csm_FOUND) message("Found CSM. Compiling some extra classes.") SET(HDRS_PROCESSOR ${HDRS_PROCESSOR} - include/laser/processor/params_icp.h - include/laser/processor/processor_loop_closure_icp.h - include/laser/processor/processor_odom_icp.h + include/${PROJECT_NAME}/processor/params_icp.h + include/${PROJECT_NAME}/processor/processor_loop_closure_icp.h + include/${PROJECT_NAME}/processor/processor_odom_icp.h ) SET(HDRS_FEATURE ${HDRS_FEATURE} - include/laser/feature/feature_icp_align.h + include/${PROJECT_NAME}/feature/feature_icp_align.h ) SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} src/processor/processor_loop_closure_icp.cpp