From 14b67082063fa3cb483b95f6f5cb45c40b3f316d Mon Sep 17 00:00:00 2001
From: Joaquim Casals <jcasals@iri.upc.edu>
Date: Wed, 22 May 2019 15:34:39 +0200
Subject: [PATCH] CMake hotfix for Yaml-cpp dependency
---
CMakeLists.txt | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 878ee4770..75295f912 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,9 +155,6 @@ ENDIF(Ceres_FOUND)
-IF(APRILTAG_INCLUDE_DIR)
- INCLUDE_DIRECTORIES(${APRILTAG_INCLUDE_DIR})
-ENDIF(APRILTAG_INCLUDE_DIR)
#HEADERS
@@ -266,6 +263,7 @@ ADD_LIBRARY(${PLUGIN_NAME}
${SRCS_YAML}
)
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY})
#Link the created libraries
#===============EXAMPLE=========================
@@ -279,11 +277,6 @@ TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
IF (GLOG_FOUND)
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${GLOG_LIBRARY})
ENDIF (GLOG_FOUND)
-#check if this is done correctly
-IF (OPENCV_FOUND AND Apriltag_FOUND)
- LINK_LIBRARIES(apriltag m)
- TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${APRILTAG_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${OPENCV_LDFLAGS} m)
-ENDIF(OPENCV_FOUND AND Apriltag_FOUND)
IF (GLOG_FOUND)
IF(BUILD_TESTS)
--
GitLab