From fac955852452eea9903d106314416e4574a01b34 Mon Sep 17 00:00:00 2001
From: fancy <258828110.@qq.com>
Date: Mon, 25 Sep 2023 09:32:09 -0700
Subject: [PATCH] Fix a build bug.

---
 Makefile                            | 19 ++++---------------
 middleware/IpcConfig/CMakeLists.txt |  2 +-
 test/utils/Config/CMakeLists.txt    |  2 +-
 utils/Config/CMakeLists.txt         | 17 +++++++++--------
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 40ce335a..6975b84f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,21 @@
 gmock:
 	$(MAKE) -C external/gtest all
+
 gmock_clean:
 	$(MAKE) -C external/gtest clean
+
 cmake:
 	$(MAKE) -C build/cmake all
+
 cmake_clean:
 	$(MAKE) -C build/cmake clean
 
-prepare:
-	@if [ -d ".git" ]; then \
-		echo "source code exist"; \
-	else \
-		echo "source code not exist"; \
-		git init; \
-		git remote add origin https://gitee.com/shenzhen-jiuyilian/ipc.git; \
-		rm Makefile; \
-		git pull origin master; \
-	fi
-	@if [ -n "$(shell git status -s)" ]; then \
-		echo "source code changed."; \
-	else \
-		echo "source code do not changed."; \
-	fi
 clean_code:
 	@rm -rf !(Makefile)
 
 all:cmake
 	$(MAKE) -C cmake-shell all
+	
 clean:
 	@if [ -d "cmake-shell" ]; then \
 		echo "cmake-shell exist"; \
diff --git a/middleware/IpcConfig/CMakeLists.txt b/middleware/IpcConfig/CMakeLists.txt
index b4af528f..21327859 100644
--- a/middleware/IpcConfig/CMakeLists.txt
+++ b/middleware/IpcConfig/CMakeLists.txt
@@ -27,7 +27,7 @@ aux_source_directory(./src SRC_FILES)
 set(TARGET_NAME IpcConfig)
 add_library(${TARGET_NAME} STATIC ${SRC_FILES})
 
-target_link_libraries(${TARGET_NAME} Config StatusCode Log)
+target_link_libraries(${TARGET_NAME} ConfigBase StatusCode Log)
 
 if ("${CLANG_TIDY_SUPPORT}" MATCHES "true")
 add_custom_target(
diff --git a/test/utils/Config/CMakeLists.txt b/test/utils/Config/CMakeLists.txt
index dedb677e..c61b6782 100644
--- a/test/utils/Config/CMakeLists.txt
+++ b/test/utils/Config/CMakeLists.txt
@@ -31,7 +31,7 @@ aux_source_directory(./src SRC_FILES)
 
 set(TARGET_NAME ConfigTest)
 add_executable(${TARGET_NAME} ${SRC_FILES})
-target_link_libraries(${TARGET_NAME} Config gtest gmock pthread)
+target_link_libraries(${TARGET_NAME} ConfigBase gtest gmock pthread)
 if(${TEST_COVERAGE} MATCHES "true")
     target_link_libraries(${TARGET_NAME} gcov)
 endif()
diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt
index 64adf7f9..31fd5ea2 100644
--- a/utils/Config/CMakeLists.txt
+++ b/utils/Config/CMakeLists.txt
@@ -19,7 +19,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 aux_source_directory(./src SRC_FILES)
 
-set(TARGET_NAME Config)
+set(TARGET_NAME ConfigBase)
 add_library(${TARGET_NAME} STATIC ${SRC_FILES})
 target_link_libraries(${TARGET_NAME} StatusCode Log config)
 
@@ -52,14 +52,15 @@ add_custom_command(
     WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/libconfig
 )
 add_custom_target(
-    compile_libconfig
+    config
     DEPENDS ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig.a
 )
-add_custom_command(
-    TARGET ${TARGET_NAME}
-    PRE_BUILD
-    COMMAND make compile_libconfig
-    WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell
-)
+
+# add_custom_command(
+#     TARGET ${TARGET_NAME}
+#     PRE_BUILD
+#     COMMAND make compile_libconfig
+#     WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell
+# )
 
 define_file_name(${TARGET_NAME})
\ No newline at end of file