Add glog without gflags (#4)

add glog as submodule integrate glog into CMake use in one of the files
ovysotska · Sep 19, 2022 · 0631d5b · 0631d5b
1 parent 9b107aa
commit 0631d5b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/external/googletest"]
 	path = src/external/googletest
 	url = https://github.com/google/googletest.git
+[submodule "src/external/glog"]
+	path = src/external/glog
+	url = https://github.com/google/glog
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,15 +2,20 @@ cmake_minimum_required(VERSION 3.10)
 
 project(image_sequence_localizer)
 
-
-include(cmake/UpdateSubmodules.cmake)
 include(GoogleTest)
+include(cmake/UpdateSubmodules.cmake)
+
 
 option(PACKAGE_TESTS "Build the tests" ON)
 if(PACKAGE_TESTS)
     enable_testing()
     add_subdirectory(src/external/googletest)
 endif()
 
+# Options for glog
+option(WITH_GFLAGS "Use gflags" OFF)
+option(WITH_GTEST "Use Google Test" OFF)
+option(BUILD_TESTING "Use Build testing" OFF)
+add_subdirectory(src/external/glog)
 add_subdirectory(src)
 
diff --git a/src/apps/cost_matrix_based_matching/CMakeLists.txt b/src/apps/cost_matrix_based_matching/CMakeLists.txt
@@ -2,11 +2,13 @@ find_package(OpenCV REQUIRED)
 
 add_executable(cost_matrix_based_matching_lsh cost_matrix_based_matching_lsh.cpp)
 target_link_libraries( cost_matrix_based_matching_lsh
+    glog::glog
     online_localizer
     cost_matrix_database
     successor_manager
     config_parser
     lsh_cv_hashing
     cnn_feature
     ${OpenCV_LIBS}
+
 )
diff --git a/src/apps/cost_matrix_based_matching/cost_matrix_based_matching_lsh.cpp b/src/apps/cost_matrix_based_matching/cost_matrix_based_matching_lsh.cpp
@@ -36,6 +36,8 @@
 #include "successor_manager/successor_manager.h"
 #include "tools/config_parser/config_parser.h"
 
+#include <glog/logging.h>
+
 using std::make_shared;
 
 std::vector<iBinarizableFeature::Ptr>
@@ -57,7 +59,9 @@ loadFeatures(const std::string &path2folder) {
 }
 
 int main(int argc, char *argv[]) {
-  printf("===== Online place recognition cost matrix based LSH ====\n");
+  google::InitGoogleLogging(argv[0]);
+  FLAGS_logtostderr = 1;
+  LOG(INFO) << "===== Online place recognition cost matrix based LSH ====\n";
   if (argc < 2) {
     printf("[ERROR] Not enough input parameters.\n");
     printf("Proper usage: ./cost_matrix_based_matching_lsh config_file.yaml\n");

diff --git a/src/external/glog b/src/external/glog
diff --git a/src/localization/features/CMakeLists.txt b/src/localization/features/CMakeLists.txt
@@ -1,8 +1,7 @@
 add_library(cnn_feature cnn_feature.cpp)
+target_link_libraries(cnn_feature PUBLIC protos)
 
 add_library(feature_factory feature_factory.cpp)
-target_link_libraries( feature_factory 
-	cnn_feature
-)
+target_link_libraries(feature_factory PUBLIC cnn_feature)
 
 add_library(feature_buffer feature_buffer.cpp)