From b857f47c8ecc13ee3d64485b5abd6b597e27f007 Mon Sep 17 00:00:00 2001 From: tunmx Date: Tue, 7 Mar 2023 17:07:54 +0800 Subject: [PATCH] Linux link Bug --- CMakeLists.txt | 11 ++++++++--- Prj-Linux/CMakeLists.txt | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16bcec8..e765e2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.10.2) project(HyperLPR3-Source) set(CMAKE_CXX_STANDARD 11) -set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin") set(LIBRARY_NAME hyperlpr3) @@ -86,8 +85,8 @@ else () set(PLAT linux) endif () # MNN Third party dependence - set(MNN_INCLUDE_DIRS ${PATH_3RDPARTY}/MNN-2.2.0/${PLAT}-static/include) - set(MNN_LIBS ${PATH_3RDPARTY}/MNN-2.2.0/${PLAT}-static/lib) + set(MNN_INCLUDE_DIRS ${PATH_3RDPARTY}/MNN-2.2.0/${PLAT}/include) + set(MNN_LIBS ${PATH_3RDPARTY}/MNN-2.2.0/${PLAT}/lib) # OpenCV Third party dependence set(OpenCV_DIR ${PATH_3RDPARTY}/opencv-4.5.1/${PLAT}/lib/cmake/opencv4) set(OpenCV_STATIC_INCLUDE_DIR ${PATH_3RDPARTY}/opencv-4.5.1/${PLAT}/include/opencv4) @@ -148,6 +147,12 @@ endif() set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/install/hyperlpr3) message(CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) install(DIRECTORY resource DESTINATION ./) +if (APPLE) + install(FILES ${MNN_LIBS}/libMNN.dylib DESTINATION ./lib) +else() + install(FILES ${MNN_LIBS}/libMNN.so DESTINATION ./lib) +endif () + if (BUILD_SAMPLES) install(TARGETS ContextSample DESTINATION ./bin) install(TARGETS CAPISample DESTINATION ./bin) diff --git a/Prj-Linux/CMakeLists.txt b/Prj-Linux/CMakeLists.txt index ccd88bf..8f81dbb 100644 --- a/Prj-Linux/CMakeLists.txt +++ b/Prj-Linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2) project(HyperLPR3-LinuxDemo) set(CMAKE_CXX_STANDARD 11) -set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin") +set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") if (APPLE) set(PLAT darwin) @@ -20,4 +20,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/hyperlpr3/include) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/hyperlpr3/lib) add_executable(PlateRecDemo ${CMAKE_CURRENT_SOURCE_DIR}/plate_rec_demo.cpp) -target_link_libraries(PlateRecDemo hyperlpr3 ${OpenCV_LIBS}) \ No newline at end of file +target_link_libraries(PlateRecDemo hyperlpr3 ${OpenCV_LIBS}) \ No newline at end of file