diff --git a/deploy/cpp_infer/CMakeLists.txt b/deploy/cpp_infer/CMakeLists.txt index 29a506846d8011f9bd4aab7110ae669799a8dd0b..6d3ecb6ac2e9e6993814f077ca772d0d94f5d008 100644 --- a/deploy/cpp_infer/CMakeLists.txt +++ b/deploy/cpp_infer/CMakeLists.txt @@ -1,4 +1,5 @@ project(ppocr CXX C) +cmake_minimum_required(VERSION 3.14) option(WITH_MKL "Compile demo with MKL/OpenBlas support, default use MKL." ON) option(WITH_GPU "Compile demo with GPU/CPU, default use CPU." OFF) @@ -206,13 +207,12 @@ endif() set(DEPS ${DEPS} ${OpenCV_LIBS}) -include(ExternalProject) +include(FetchContent) include(external-cmake/auto-log.cmake) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/autolog/src/extern_Autolog/auto_log) +include_directories(${FETCHCONTENT_BASE_DIR}/extern_autolog-src) AUX_SOURCE_DIRECTORY(./src SRCS) add_executable(${DEMO_NAME} ${SRCS}) - target_link_libraries(${DEMO_NAME} ${DEPS}) if (WIN32 AND WITH_MKL) diff --git a/deploy/cpp_infer/external-cmake/auto-log.cmake b/deploy/cpp_infer/external-cmake/auto-log.cmake index dfa56188e890d11996c00aab23ef8117a0466084..becbff0f45df51e5db541889ae1ffdacf2c4fc78 100644 --- a/deploy/cpp_infer/external-cmake/auto-log.cmake +++ b/deploy/cpp_infer/external-cmake/auto-log.cmake @@ -1,14 +1,13 @@ find_package(Git REQUIRED) -message("${CMAKE_BUILD_TYPE}") +include(FetchContent) -set(AUTOLOG_REPOSITORY https://github.com/LDOUBLEV/AutoLog.git) -SET(AUTOLOG_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/install/Autolog) +set(FETCHCONTENT_BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third-party") -ExternalProject_Add( - extern_Autolog - PREFIX autolog - GIT_REPOSITORY ${AUTOLOG_REPOSITORY} - GIT_TAG main - DOWNLOAD_NO_EXTRACT True - INSTALL_COMMAND cmake -E echo "Skipping install step." +FetchContent_Declare( + extern_Autolog + PREFIX autolog + GIT_REPOSITORY https://github.com/LDOUBLEV/AutoLog.git + GIT_TAG main ) +FetchContent_MakeAvailable(extern_Autolog) + diff --git a/deploy/cpp_infer/src/main.cpp b/deploy/cpp_infer/src/main.cpp index 382be7970688836e407b0d0a1a66cb6b93daf2b7..6e8ded7f8d3cde08182d551decedd2e1777956aa 100644 --- a/deploy/cpp_infer/src/main.cpp +++ b/deploy/cpp_infer/src/main.cpp @@ -35,6 +35,7 @@ #include #include +#include "auto_log/autolog.h" DEFINE_bool(use_gpu, false, "Infering with GPU or CPU."); DEFINE_int32(gpu_id, 0, "Device id of GPU to execute.");