From f7391b53a87e377fb7f8fc45cbe7a944375fba58 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 5 Aug 2024 22:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/CMakeLists.txt | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 0000c208..4c8ce219 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -36,9 +36,6 @@ add_definitions(-DHAVE_STRING_H) # for memcpy in md5.c add_definitions(-DOUTPUT_CAMERA_DBG_INFO) add_definitions(-DALIGN_HB_TIMER_TO_PHOTO) -# set(OpenCV_DIR D:/Workspace/deps/OpenCV-android-sdk/sdk/native/jni/) -set(OPENCV_EXTRA_MODULES_PATH D:/Workspace/Github/opencv_contrib/modules) - # include_directories(${OpenCV_DIR}/include) # add_library( lib_opencv SHARED IMPORTED ) # set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION ${OpenCV_DIR}/../libs/${ANDROID_ABI}/libopencv_java4.so) @@ -47,9 +44,6 @@ set(OPENCV_EXTRA_MODULES_PATH D:/Workspace/Github/opencv_contrib/modules) project("microphoto") -# message(FATAL_ERROR "OpenCV ${OpenCV_DIR}") - - find_package(OpenCV REQUIRED core imgproc highgui) # find_package(OpenCV REQUIRED core imgproc) if(OpenCV_FOUND) @@ -237,31 +231,6 @@ include_directories(${FREETYPE_ROOT}/include) include_directories(${TERM_CORE_ROOT}) # include_directories(${PROJECT_SOURCE_DIR}/../../../../../libs/inc/) -#[[ -add_library( # Sets the name of the library. - evpp_lite - - # Sets the library as a shared library. - STATIC - - # Provides a relative path to your source file(s). - ${EVPP_SOURCES} ) -]] - -IF (CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") - # set(BOOST_ROOT C:/ProgramData/boost_1_82_0/) - # set(BOOST_INCLUDEDIR C:/ProgramData/boost_1_82_0/) - include_directories(C:/ProgramData/boost_1_82_0/) -ELSE() - # find_package(Boost 1.58.0 COMPONENTS) - #find_package(Boost 1.58.0) - #if(Boost_FOUND) - # include_directories(${Boost_INCLUDE_DIRS}) - #else() - # message(FATAL_ERROR "Boost Not Found") - #endif() -endif() - # Creates and names a library, sets it as either STATIC # or SHARED, and provides the relative paths to its source code. # You can define multiple libraries, and CMake builds them for you.