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

Improve libconfig compile.

Browse Source
This commit is contained in:
fancy 2023-11-11 18:27:33 -08:00
parent f008337684
commit 882af7f6b0
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
external/libconfig/build_libconfig.sh vendored Normal file → Executable file
View File

2
test/utils/Config/src/Config_Test.cpp
View File

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

8
utils/Config/CMakeLists.txt
View File

@ -21,7 +21,7 @@ aux_source_directory(./src SRC_FILES)
set(TARGET_NAME ConfigBase) set(TARGET_NAME ConfigBase)
add_library(${TARGET_NAME} STATIC ${SRC_FILES}) add_library(${TARGET_NAME} STATIC ${SRC_FILES})
target_link_libraries(${TARGET_NAME} StatusCode Log config) target_link_libraries(${TARGET_NAME} StatusCode Log config++)
if ("${CLANG_TIDY_SUPPORT}" MATCHES "true") if ("${CLANG_TIDY_SUPPORT}" MATCHES "true")
add_custom_target( add_custom_target(
@ -45,15 +45,15 @@ endif()
# build libconfig before make libConfig.a # build libconfig before make libConfig.a
add_custom_command( add_custom_command(
OUTPUT ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig.a OUTPUT ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig++.a
COMMAND echo "Build libconfig-1.7.3. CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}" COMMAND echo "Build libconfig-1.7.3. CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}"
# COMMAND tar zxvf libconfig-1.7.3.tar.gz # COMMAND tar zxvf libconfig-1.7.3.tar.gz
COMMAND sh build_libconfig.sh ${TARGET_PLATFORM} ${CROSS_COMPILER_PATH} ${CMAKE_C_COMPILER} COMMAND sh build_libconfig.sh ${TARGET_PLATFORM} ${CROSS_COMPILER_PATH} ${CMAKE_C_COMPILER}
WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/libconfig WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/libconfig
) )
add_custom_target( add_custom_target(
config config++
DEPENDS ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig.a DEPENDS ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig++.a
) )
# add_custom_command( # add_custom_command(