-
Notifications
You must be signed in to change notification settings - Fork 18
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
1 changed file
with
25 additions
and
14 deletions.
There are no files selected for viewing
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,20 +1,31 @@ | ||
| diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt | ||
| index b5656e1..ad1ccc5 100644 | ||
| index b5656e1..f89b6d1 100644 | ||
| --- a/source/3rd_party/CMakeLists.txt | ||
| +++ b/source/3rd_party/CMakeLists.txt | ||
| @@ -115,7 +115,7 @@ if(FFTW_FOUND) | ||
| @@ -114,16 +114,16 @@ if(FFTW_FOUND) | ||
| target_include_directories(cimg INTERFACE ${FFTW_INCLUDE_DIRS}) | ||
| endif() | ||
| if (CMAKE_MODULE_PATH) | ||
|
|
||
| -if (CMAKE_MODULE_PATH) | ||
| - find_package(OpenCV QUIET) | ||
| + # find_package(OpenCV QUIET) | ||
| if (OpenCV_FOUND) | ||
| target_compile_definitions(cimg INTERFACE cimg_use_opencv) | ||
| target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) | ||
| @@ -153,4 +153,4 @@ endif() | ||
| if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) | ||
| install(TARGETS cimg | ||
| EXPORT Matplot++Targets) | ||
| - if (OpenCV_FOUND) | ||
| - target_compile_definitions(cimg INTERFACE cimg_use_opencv) | ||
| - target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) | ||
| - target_include_directories(cimg INTERFACE ${OpenCV_INCLUDE_DIRS}) | ||
| - endif() | ||
| -else() | ||
| - message("No CMAKE_MODULE_PATH path for OpenCV configured") | ||
| -endif() | ||
| \ No newline at end of file | ||
| +endif() | ||
| +# if (CMAKE_MODULE_PATH) | ||
| +# find_package(OpenCV QUIET) | ||
| +# if (OpenCV_FOUND) | ||
| +# target_compile_definitions(cimg INTERFACE cimg_use_opencv) | ||
| +# target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) | ||
| +# target_include_directories(cimg INTERFACE ${OpenCV_INCLUDE_DIRS}) | ||
| +# endif() | ||
| +# else() | ||
| +# message("No CMAKE_MODULE_PATH path for OpenCV configured") | ||
| +# endif() | ||
|
|
||
|
|
||
| if(LIBAVCODEC_FOUND AND LIBAVFORMAT_FOUND AND LIBSWSCALE_FOUND AND LIBAVUTIL_FOUND) |