Commit 787e56ab authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

disabled gpucodec module on MacOS

parent 3be997cf
if(ANDROID OR IOS) if(ANDROID OR IOS OR APPLE)
ocv_module_disable(gpucodec) ocv_module_disable(gpucodec)
endif() endif()
......
...@@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope ...@@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_ml opencv_video opencv_objdetect opencv_features2d
opencv_calib3d opencv_legacy opencv_contrib opencv_gpu opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
opencv_nonfree opencv_softcascade opencv_superres opencv_nonfree opencv_softcascade opencv_superres
opencv_gpucodec opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc
opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
opencv_gpustereo opencv_gpulegacy) opencv_gpustereo opencv_gpulegacy)
...@@ -24,6 +24,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ...@@ -24,6 +24,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include") ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
endif() endif()
if(HAVE_opencv_gpucodec)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpucodec/include")
endif()
if(HAVE_CUDA) if(HAVE_CUDA)
ocv_include_directories(${CUDA_INCLUDE_DIRS}) ocv_include_directories(${CUDA_INCLUDE_DIRS})
endif() endif()
...@@ -43,6 +47,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ...@@ -43,6 +47,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
if(HAVE_opencv_nonfree) if(HAVE_opencv_nonfree)
target_link_libraries(${the_target} opencv_nonfree) target_link_libraries(${the_target} opencv_nonfree)
endif() endif()
if(HAVE_opencv_gpucodec)
target_link_libraries(${the_target} opencv_gpucodec)
endif()
set_target_properties(${the_target} PROPERTIES set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${project}-example-${name}" OUTPUT_NAME "${project}-example-${name}"
......
#include <iostream> #include <iostream>
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_GPUCODEC)
#include <string> #include <string>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
...@@ -69,3 +74,13 @@ int main(int argc, const char* argv[]) ...@@ -69,3 +74,13 @@ int main(int argc, const char* argv[])
return 0; return 0;
} }
#else
int main()
{
std::cout << "OpenCV was built without GPU Video decoding support\n" << std::endl;
return 0;
}
#endif
#include <iostream> #include <iostream>
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_GPUCODEC) && defined(WIN32)
#include <vector> #include <vector>
#include <numeric> #include <numeric>
...@@ -94,3 +99,13 @@ int main(int argc, const char* argv[]) ...@@ -94,3 +99,13 @@ int main(int argc, const char* argv[])
return 0; return 0;
} }
#else
int main()
{
std::cout << "OpenCV was built without GPU Video encoding support\n" << std::endl;
return 0;
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment