-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
472 additions
and
471 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- a/cmake/OpenCVFindOpenEXR.cmake | ||
| +++ b/cmake/OpenCVFindOpenEXR.cmake | ||
| @@ -9,6 +9,15 @@ | ||
| # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR. | ||
| # | ||
|
|
||
| +find_package(OpenEXR REQUIRED) | ||
| +if(TARGET OpenEXR::OpenEXR) | ||
| + set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) | ||
| +else() | ||
| + set(OPENEXR_LIBRARIES openexr::openexr) | ||
| +endif() | ||
| +set(OPENEXR_FOUND TRUE) | ||
| +set(OPENEXR_VERSION ${OpenEXR_VERSION}) | ||
| +return() | ||
| SET(OPENEXR_LIBRARIES "") | ||
| SET(OPENEXR_LIBSEARCH_SUFFIXES "") | ||
| file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/modules/gapi/cmake/init.cmake | ||
| +++ b/modules/gapi/cmake/init.cmake | ||
| @@ -4,7 +4,7 @@ if(NOT WITH_ADE) | ||
| return() | ||
| endif() | ||
|
|
||
| -if (ade_DIR) | ||
| +if (1) | ||
| # if ade_DIR is set, use ADE-supplied CMake script | ||
| # to set up variables to the prebuilt ADE | ||
| find_package(ade 0.1.0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- a/modules/objdetect/CMakeLists.txt | ||
| +++ b/modules/objdetect/CMakeLists.txt | ||
| @@ -5,3 +5,2 @@ if(HAVE_QUIRC) | ||
| - get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) | ||
| - ocv_include_directories(${QUIRC_INCLUDE}) | ||
| - ocv_target_link_libraries(${the_module} quirc) | ||
| + find_package(quirc REQUIRED CONFIG) | ||
| + ocv_target_link_libraries(${the_module} quirc::quirc) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/modules/gapi/cmake/init.cmake | ||
| +++ b/modules/gapi/cmake/init.cmake | ||
| @@ -7,7 +7,7 @@ if(NOT WITH_ADE) | ||
| return() | ||
| endif() | ||
|
|
||
| -if(ade_DIR) | ||
| +if(1) | ||
| # if ade_DIR is set, use ADE-supplied CMake script | ||
| # to set up variables to the prebuilt ADE | ||
| find_package(ade 0.1.0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| --- a/cmake/OpenCVFindOpenEXR.cmake | ||
| +++ b/cmake/OpenCVFindOpenEXR.cmake | ||
| @@ -9,13 +9,15 @@ | ||
| # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR. | ||
| # | ||
|
|
||
| -find_package(OpenEXR 3.0 CONFIG QUIET) | ||
| +find_package(OpenEXR REQUIRED) | ||
| if(TARGET OpenEXR::OpenEXR) | ||
| - SET(OPENEXR_FOUND TRUE) | ||
| - SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR) | ||
| - SET(OPENEXR_VERSION ${OpenEXR_VERSION}) | ||
| - return() | ||
| + set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) | ||
| +else() | ||
| + set(OPENEXR_LIBRARIES openexr::openexr) | ||
| endif() | ||
| +set(OPENEXR_FOUND TRUE) | ||
| +set(OPENEXR_VERSION ${OpenEXR_VERSION}) | ||
| +return() | ||
|
|
||
| SET(OPENEXR_LIBRARIES "") | ||
| SET(OPENEXR_LIBSEARCH_SUFFIXES "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| --- a/cmake/OpenCVFindOpenEXR.cmake | ||
| +++ b/cmake/OpenCVFindOpenEXR.cmake | ||
| @@ -9,21 +9,15 @@ | ||
| # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR. | ||
| # | ||
|
|
||
| -if(NOT OPENCV_SKIP_OPENEXR_FIND_PACKAGE) | ||
| - find_package(OpenEXR 3 QUIET) | ||
| - #ocv_cmake_dump_vars(EXR) | ||
| - if(OpenEXR_FOUND) | ||
| - if(TARGET OpenEXR::OpenEXR) # OpenEXR 3+ | ||
| - set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) | ||
| - set(OPENEXR_INCLUDE_PATHS "") | ||
| - set(OPENEXR_VERSION "${OpenEXR_VERSION}") | ||
| - set(OPENEXR_FOUND 1) | ||
| - return() | ||
| - else() | ||
| - message(STATUS "Unsupported find_package(OpenEXR) - missing OpenEXR::OpenEXR target (version ${OpenEXR_VERSION})") | ||
| - endif() | ||
| - endif() | ||
| +find_package(OpenEXR REQUIRED) | ||
| +if(TARGET OpenEXR::OpenEXR) | ||
| + set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) | ||
| +else() | ||
| + set(OPENEXR_LIBRARIES openexr::openexr) | ||
| endif() | ||
| +set(OPENEXR_FOUND TRUE) | ||
| +set(OPENEXR_VERSION ${OpenEXR_VERSION}) | ||
| +return() | ||
|
|
||
| SET(OPENEXR_LIBRARIES "") | ||
| SET(OPENEXR_LIBSEARCH_SUFFIXES "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,28 @@ | ||
| cmake_minimum_required(VERSION 3.1) | ||
| project(test_package) | ||
|
|
||
| include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | ||
| conan_basic_setup(TARGETS) | ||
|
|
||
| find_package(OpenCV REQUIRED imgcodecs highgui objdetect CONFIG) | ||
| cmake_minimum_required(VERSION 3.8) | ||
| project(test_package LANGUAGES CXX) | ||
|
|
||
| option(built_with_ade "Enabled if opencv is built with ade" OFF) | ||
| if(built_with_ade) | ||
| add_definitions(-DBUILT_WITH_ADE) | ||
| endif() | ||
|
|
||
| option(built_with_ffmpeg "Enabled if opencv is built with ffmpeg" OFF) | ||
| if(built_with_ffmpeg) | ||
| add_definitions(-DBUILT_WITH_FFMPEG) | ||
| endif() | ||
|
|
||
| option(built_contrib_sfm "Enabled if opencv is built contrib sfm" OFF) | ||
| if(built_contrib_sfm) | ||
| add_definitions(-DBUILT_CONTRIB_SFM) | ||
| endif() | ||
|
|
||
| find_package(OpenCV REQUIRED imgcodecs highgui objdetect CONFIG) | ||
|
|
||
| add_executable(${PROJECT_NAME} test_package.cpp) | ||
| target_link_libraries(${PROJECT_NAME} | ||
| target_link_libraries(${PROJECT_NAME} PRIVATE | ||
| opencv_imgcodecs | ||
| opencv_highgui | ||
| opencv_objdetect | ||
| $<TARGET_NAME_IF_EXISTS:opencv_gapi> | ||
| $<TARGET_NAME_IF_EXISTS:opencv_videoio> | ||
| $<TARGET_NAME_IF_EXISTS:opencv_sfm> | ||
| ) | ||
| set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) | ||
| target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) | ||
| if(built_with_ade) | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE BUILT_WITH_ADE) | ||
| endif() | ||
| if(built_with_ffmpeg) | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE BUILT_WITH_FFMPEG) | ||
| endif() | ||
| if(built_contrib_sfm) | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE BUILT_CONTRIB_SFM) | ||
| endif() |
Oops, something went wrong.