Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Improve build.

Browse Source
This commit is contained in:
fancy 2023-09-10 07:15:05 -07:00
parent 155edbee92
commit 1930349f6e
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
cmake-shell/ cmake-shell/
external/gtest/googletest-release-1.11.0/ external/gtest/googletest-release-1.11.0/
external/libconfig/libconfig-1.7.3/ external/libconfig/libconfig-1.7.3/
out/ output_files/

6
build/global_config.cmake
View File

@ -1,9 +1,9 @@
set(DEFINE_LINUX "linux") set(DEFINE_LINUX "linux")
set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}")
set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPCSDK}") set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPCSDK}")
set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/out/bin") set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/output_files/bin")
set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/out/libs") set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/output_files/libs")
set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/out/test") set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/output_files/test")
set(PROJECT_ROOT_PATH "${PLATFORM_PATH}") set(PROJECT_ROOT_PATH "${PLATFORM_PATH}")
set(APPLICATION_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/application") set(APPLICATION_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/application")

2
doc/cmake_exploitReport.md
View File

@ -5,7 +5,7 @@
## 1.2 功能介绍 ## 1.2 功能介绍
* 设置库文件输出路径:`set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})`. * 设置库文件输出路径:`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(./)`. * 添加实现功能的文件目录:`include_directories(./)`.
该语句旨在向编译器告知该功能的实现文件和头文件的所在位置。 该语句旨在向编译器告知该功能的实现文件和头文件的所在位置。

2
test/hal/src/IHalTest.cpp
View File

@ -5,7 +5,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace IHalTest namespace IHalTest
{ {
// ../out/test/bin/IHalTest --gtest_filter=IHalTest.Demo // ../output_files/test/bin/IHalTest --gtest_filter=IHalTest.Demo
TEST(IHalTest, Demo) TEST(IHalTest, Demo)
{ {
ILogInit(LOG_EASYLOGGING); ILogInit(LOG_EASYLOGGING);

2
test/utils/Log/src/ILogTest.cpp
View File

@ -3,7 +3,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace ILogTest namespace ILogTest
{ {
// ../out/test/bin/LogTest --gtest_filter=ILogTest.Demo // ../output_files/test/bin/LogTest --gtest_filter=ILogTest.Demo
TEST(ILogTest, Demo) TEST(ILogTest, Demo)
{ {
CreateLogModule(); CreateLogModule();

2
test/utils/LogC/src/LogCTest.cpp
View File

@ -4,7 +4,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace LogCTest namespace LogCTest
{ {
// ../out/test/bin/LogCTest --gtest_filter=LogCTest.Demo // ../output_files/test/bin/LogCTest --gtest_filter=LogCTest.Demo
TEST(LogCTest, Demo) TEST(LogCTest, Demo)
{ {
create_log_module(); create_log_module();

2
test/utils/ReturnCode/src/ReturnCodeTest.cpp
View File

@ -4,7 +4,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace ReturnCodeTest namespace ReturnCodeTest
{ {
// ../out/test/bin/ReturnCodeTest --gtest_filter=ReturnCodeTest.Demo // ../output_files/test/bin/ReturnCodeTest --gtest_filter=ReturnCodeTest.Demo
TEST(ReturnCodeTest, Demo) TEST(ReturnCodeTest, Demo)
{ {
InitLog(LOG_EASYLOGGING, nullptr); InitLog(LOG_EASYLOGGING, nullptr);

2
utils/Log/src/LogEasylogging.cpp
View File

@ -24,7 +24,7 @@ LogEasylogging::LogEasylogging(const LogSetting *setting)
void LogEasylogging::Init(const enum LogInstance &log) void LogEasylogging::Init(const enum LogInstance &log)
{ {
#if 0 #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); el::Loggers::reconfigureAllLoggers(conf);
#endif #endif
// Set the log path. // Set the log path.

2
utils/Logold/src/LogEasylogging.cpp
View File

@ -23,7 +23,7 @@ LogEasylogging::LogEasylogging(const LogSetting *setting)
bool LogEasylogging::Init() bool LogEasylogging::Init()
{ {
#if 0 #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); el::Loggers::reconfigureAllLoggers(conf);
#endif #endif
// Set the log path. // Set the log path.