From 772e18ff3fc21772fe3e04c7c43897fdcbb128ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaquim=20Casals=20Bu=C3=B1uel?= <jcasals@iri.upc.edu>
Date: Mon, 4 Feb 2019 13:11:45 +0100
Subject: [PATCH] added missing files CMake fixed wolfConfig.cmake include dir
---
CMakeLists.txt | 36 +++++++++++++++++++++-------------
cmake_modules/wolfConfig.cmake | 2 +-
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e1767a12..fe3de9ae3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -594,13 +594,17 @@ ELSE(Ceres_FOUND)
ENDIF(Ceres_FOUND)
IF (laser_scan_utils_FOUND)
- SET(HDRS ${HDRS}
-include/base/capture/capture_laser_2D.h
-include/base/sensor/sensor_laser_2D.h
-include/base/processor/processor_tracker_feature_corner.h
-include/base/processor/processor_tracker_landmark_corner.h
-include/base/processor/processor_tracker_landmark_polyline.h
+ SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+ include/base/capture/capture_laser_2D.h
)
+ SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
+ include/base/processor/processor_tracker_feature_corner.h
+ include/base/processor/processor_tracker_landmark_corner.h
+ include/base/processor/processor_tracker_landmark_polyline.h
+ )
+ SET(HDRS_SENSOR ${HDRS_SENSOR}
+ include/base/sensor/sensor_laser_2D.h
+ )
SET(SRCS ${SRCS}
src/sensor/sensor_laser_2D.cpp
src/processor/processor_tracker_feature.cpp
@@ -613,10 +617,12 @@ src/processor/processor_tracker_landmark_dummy.cpp
ENDIF(laser_scan_utils_FOUND)
IF (raw_gps_utils_FOUND)
- SET(HDRS ${HDRS}
-include/base/capture/capture_GPS.h
-include/base/processor/processor_GPS.h
- )
+ SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+ include/base/capture/capture_GPS.h
+ )
+ SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
+ include/base/processor/processor_GPS.h
+ )
SET(SRCS ${SRCS}
src/capture/capture_GPS.cpp
src/processor/processor_GPS.cpp
@@ -625,10 +631,12 @@ ENDIF(raw_gps_utils_FOUND)
# Vision
IF (vision_utils_FOUND)
- SET(HDRS ${HDRS}
-include/base/capture/capture_image.h
-include/base/feature/feature_point_image.h
- )
+ SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+ include/base/capture/capture_image.h
+ )
+ SET(HDRS_FEATURE ${HDRS_FEATURE}
+ include/base/feature/feature_point_image.h
+ )
SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
include/base/processor/processor_tracker_feature_trifocal.h
include/base/processor/processor_params_image.h
diff --git a/cmake_modules/wolfConfig.cmake b/cmake_modules/wolfConfig.cmake
index ed9ca5a76..82bb7cf0a 100644
--- a/cmake_modules/wolfConfig.cmake
+++ b/cmake_modules/wolfConfig.cmake
@@ -140,7 +140,7 @@ if (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf)
"partially relocated outside of CMake after wolf was built.")
# endif (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf/wolf.h)
endif (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf)
-list(APPEND wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIR})
+list(APPEND wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIR}/wolf)
# Set the version.
set(wolf_VERSION 0.0.1)
--
GitLab