Issue #21: Adding glog submodule, update CMakeLists.txt files

taketook34 · taketook34 · commit 3777116b5ad1 · 2025-05-23T21:10:15.000+03:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "external/librobotcontrol"]
 	path = external/librobotcontrol
 	url = git@github.com:KPI-Rover/external_librobotcontrol.git
+[submodule "external/glog"]
+	path = external/glog
+	url = https://github.com/google/glog.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,7 @@ project(kpi_rover_ecu)
 if(BUILD_VARIANT STREQUAL "Target")
     option(BUILD_LIBROBOT_CONTROL "Build librobotcontrol using original Makefile" ON)
     add_subdirectory(external/librobotcontrol)
+    add_subdirectory(external/glog)
     add_subdirectory(src/kpi_rover_ecu)
 endif()
 
diff --git a/external/glog b/external/glog
@@ -0,0 +1 @@
+Subproject commit 8f9ccfe770add9e4c64e9b25c102658e3c763b73
diff --git a/src/kpi_rover_ecu/CMakeLists.txt b/src/kpi_rover_ecu/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     kpi_rover_ecu_core
     Threads::Threads
     robotcontrol
+    glog
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE
diff --git a/src/kpi_rover_ecu/src/CMakeLists.txt b/src/kpi_rover_ecu/src/CMakeLists.txt
@@ -15,4 +15,7 @@ add_library(kpi_rover_ecu_core STATIC
 target_include_directories(kpi_rover_ecu_core PUBLIC
     ${CMAKE_SOURCE_DIR}/src/kpi_rover_ecu/include
     ${CMAKE_SOURCE_DIR}/external/librobotcontrol/library/include
+    ${CMAKE_SOURCE_DIR}/external/glog/
 )
+
+target_link_libraries(kpi_rover_ecu_core PUBLIC glog)

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE`
`20`	`20`	`kpi_rover_ecu_core`
`21`	`21`	`Threads::Threads`
`22`	`22`	`robotcontrol`
	`23`	`+ glog`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`target_include_directories(${PROJECT_NAME} PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,7 @@ add_library(kpi_rover_ecu_core STATIC`
`15`	`15`	`target_include_directories(kpi_rover_ecu_core PUBLIC`
`16`	`16`	`${CMAKE_SOURCE_DIR}/src/kpi_rover_ecu/include`
`17`	`17`	`${CMAKE_SOURCE_DIR}/external/librobotcontrol/library/include`
	`18`	`+ ${CMAKE_SOURCE_DIR}/external/glog/`
`18`	`19`	`)`
	`20`	`+`
	`21`	`+target_link_libraries(kpi_rover_ecu_core PUBLIC glog)`