From 1930349f6ef167b7b18bd9a73b566f6484950c86 Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Sun, 10 Sep 2023 07:15:05 -0700 Subject: [PATCH] Improve build. --- .gitignore | 2 +- build/global_config.cmake | 6 +++--- doc/cmake_exploitReport.md | 2 +- test/hal/src/IHalTest.cpp | 2 +- test/utils/Log/src/ILogTest.cpp | 2 +- test/utils/LogC/src/LogCTest.cpp | 2 +- test/utils/ReturnCode/src/ReturnCodeTest.cpp | 2 +- utils/Log/src/LogEasylogging.cpp | 2 +- utils/Logold/src/LogEasylogging.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c939ded8..800ac97c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ cmake-shell/ external/gtest/googletest-release-1.11.0/ external/libconfig/libconfig-1.7.3/ -out/ \ No newline at end of file +output_files/ \ No newline at end of file diff --git a/build/global_config.cmake b/build/global_config.cmake index ae227b73..37c4c845 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -1,9 +1,9 @@ set(DEFINE_LINUX "linux") set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPCSDK}") -set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/out/bin") -set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/out/libs") -set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/out/test") +set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/output_files/bin") +set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/output_files/libs") +set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/output_files/test") set(PROJECT_ROOT_PATH "${PLATFORM_PATH}") set(APPLICATION_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/application") diff --git a/doc/cmake_exploitReport.md b/doc/cmake_exploitReport.md index 66d816db..61a54da6 100644 --- a/doc/cmake_exploitReport.md +++ b/doc/cmake_exploitReport.md @@ -5,7 +5,7 @@ ## 1.2 功能介绍 * 设置库文件输出路径:`set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})`. -该语句用于设置该功能的静态库的生成路径,其中`${LIBS_OUTPUT_PATH}`在/build/cmake/global_config.cmake被定义在项目根目录的/out/libs/。 +该语句用于设置该功能的静态库的生成路径,其中`${LIBS_OUTPUT_PATH}`在/build/cmake/global_config.cmake被定义在项目根目录的/output_files/libs/。 * 添加实现功能的文件目录:`include_directories(./)`. 该语句旨在向编译器告知该功能的实现文件和头文件的所在位置。 diff --git a/test/hal/src/IHalTest.cpp b/test/hal/src/IHalTest.cpp index c51cffed..fd5ba1bc 100644 --- a/test/hal/src/IHalTest.cpp +++ b/test/hal/src/IHalTest.cpp @@ -5,7 +5,7 @@ #include namespace IHalTest { - // ../out/test/bin/IHalTest --gtest_filter=IHalTest.Demo + // ../output_files/test/bin/IHalTest --gtest_filter=IHalTest.Demo TEST(IHalTest, Demo) { ILogInit(LOG_EASYLOGGING); diff --git a/test/utils/Log/src/ILogTest.cpp b/test/utils/Log/src/ILogTest.cpp index e364ccfd..4e3bb5b6 100644 --- a/test/utils/Log/src/ILogTest.cpp +++ b/test/utils/Log/src/ILogTest.cpp @@ -3,7 +3,7 @@ #include namespace ILogTest { - // ../out/test/bin/LogTest --gtest_filter=ILogTest.Demo + // ../output_files/test/bin/LogTest --gtest_filter=ILogTest.Demo TEST(ILogTest, Demo) { CreateLogModule(); diff --git a/test/utils/LogC/src/LogCTest.cpp b/test/utils/LogC/src/LogCTest.cpp index 3b061a41..e7533eda 100644 --- a/test/utils/LogC/src/LogCTest.cpp +++ b/test/utils/LogC/src/LogCTest.cpp @@ -4,7 +4,7 @@ #include namespace LogCTest { - // ../out/test/bin/LogCTest --gtest_filter=LogCTest.Demo + // ../output_files/test/bin/LogCTest --gtest_filter=LogCTest.Demo TEST(LogCTest, Demo) { create_log_module(); diff --git a/test/utils/ReturnCode/src/ReturnCodeTest.cpp b/test/utils/ReturnCode/src/ReturnCodeTest.cpp index 36a99c19..35de8605 100644 --- a/test/utils/ReturnCode/src/ReturnCodeTest.cpp +++ b/test/utils/ReturnCode/src/ReturnCodeTest.cpp @@ -4,7 +4,7 @@ #include namespace ReturnCodeTest { - // ../out/test/bin/ReturnCodeTest --gtest_filter=ReturnCodeTest.Demo + // ../output_files/test/bin/ReturnCodeTest --gtest_filter=ReturnCodeTest.Demo TEST(ReturnCodeTest, Demo) { InitLog(LOG_EASYLOGGING, nullptr); diff --git a/utils/Log/src/LogEasylogging.cpp b/utils/Log/src/LogEasylogging.cpp index 6ed5c967..aa5cbd12 100644 --- a/utils/Log/src/LogEasylogging.cpp +++ b/utils/Log/src/LogEasylogging.cpp @@ -24,7 +24,7 @@ LogEasylogging::LogEasylogging(const LogSetting *setting) void LogEasylogging::Init(const enum LogInstance &log) { #if 0 - el::Configurations conf("/home/xiaojiazhu/project/OS/OSThings/test/out/bin/default-logger.conf"); + el::Configurations conf("/home/xiaojiazhu/project/OS/OSThings/test/output_files/bin/default-logger.conf"); el::Loggers::reconfigureAllLoggers(conf); #endif // Set the log path. diff --git a/utils/Logold/src/LogEasylogging.cpp b/utils/Logold/src/LogEasylogging.cpp index 15e2caac..10f10ce8 100644 --- a/utils/Logold/src/LogEasylogging.cpp +++ b/utils/Logold/src/LogEasylogging.cpp @@ -23,7 +23,7 @@ LogEasylogging::LogEasylogging(const LogSetting *setting) bool LogEasylogging::Init() { #if 0 - el::Configurations conf("/home/xiaojiazhu/project/OS/OSThings/test/out/bin/default-logger.conf"); + el::Configurations conf("/home/xiaojiazhu/project/OS/OSThings/test/output_files/bin/default-logger.conf"); el::Loggers::reconfigureAllLoggers(conf); #endif // Set the log path.