From f7552494f2901193752c6ffad286343b43ea62e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Thu, 23 May 2019 00:27:39 +0200
Subject: [PATCH] Rationalize cmake libraries a bit
---
CMakeLists.txt | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 044a9738e..fce1dd1a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ FIND_PACKAGE(wolf REQUIRED)
FIND_PACKAGE(YamlCpp REQUIRED)
IF(YAMLCPP_FOUND)
- MESSAGE("yaml-cpp Library FOUND: yaml-cpp related sources will be built.")
+ MESSAGE("yaml-cpp Library FOUND!")
ELSEIF(YAMLCPP_FOUND)
MESSAGE("yaml-cpp Library NOT FOUND!")
ENDIF(YAMLCPP_FOUND)
@@ -265,26 +265,22 @@ ADD_LIBRARY(${PLUGIN_NAME}
${SRCS_WRAPPER}
${SRCS_YAML}
)
-TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
#Link the created libraries
#===============EXAMPLE=========================
# IF (Ceres_FOUND)
# TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES})
# ENDIF(Ceres_FOUND)
-
-
-#Build tests
-#===============EXAMPLE=========================
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARY})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY})
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)
+
+#Build tests
+#===============EXAMPLE=========================
IF (GLOG_FOUND)
IF(BUILD_TESTS)
MESSAGE("Building tests.")
--
GitLab