diff --git a/external/libconfig/build_libconfig.sh b/external/libconfig/build_libconfig.sh index 8495a4e..1d7b516 100755 --- a/external/libconfig/build_libconfig.sh +++ b/external/libconfig/build_libconfig.sh @@ -17,12 +17,12 @@ if [ ! -f "./libconfig-1.7.3/lib/.libs/libconfig++.a" ] || [ ! -f "./libconfig-1 case $platform in "linux") echo "==Compile linux." - ./configure + ./configure --disable-cxx --enable-static=yes make ;; *) echo "==Compile cross compile." - ./configure --host=$CROSS_COMPILER + ./configure --host=$CROSS_COMPILER --disable-cxx --enable-static=yes make ;; esac diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt index 367a4a7..236b09d 100644 --- a/utils/Config/CMakeLists.txt +++ b/utils/Config/CMakeLists.txt @@ -21,7 +21,7 @@ aux_source_directory(./src SRC_FILES) set(TARGET_NAME ConfigBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) -target_link_libraries(${TARGET_NAME} StatusCode Log config++) +target_link_libraries(${TARGET_NAME} StatusCode Log libconfig.a) if ("${CLANG_TIDY_SUPPORT}" MATCHES "true") add_custom_target( @@ -45,15 +45,15 @@ endif() # build libconfig before make libConfig.a 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 tar zxvf libconfig-1.7.3.tar.gz COMMAND sh build_libconfig.sh ${TARGET_PLATFORM} ${CROSS_COMPILER_PATH} ${CMAKE_C_COMPILER} WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/libconfig ) add_custom_target( - config++ - DEPENDS ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig++.a + libconfig.a + DEPENDS ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs/libconfig.a ) # add_custom_command(