466f78fd71
- Fix support for new ffmpeg versions (forwarded request 79166 from RedDwarf) OBS-URL: https://build.opensuse.org/request/show/79172 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=19
24 lines
785 B
Diff
24 lines
785 B
Diff
diff -urN OpenCV-2.3.0-orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
|
|
--- OpenCV-2.3.0-orig/CMakeLists.txt 2011-07-04 07:21:50.000000000 +0300
|
|
+++ OpenCV-2.3.0/CMakeLists.txt 2011-08-14 03:02:57.072585001 +0300
|
|
@@ -845,8 +845,8 @@
|
|
|
|
message(STATUS "CUDA NVCC target flags: ${CUDA_NVCC_FLAGS}")
|
|
else()
|
|
- unset(CUDA_ARCH_BIN CACHE)
|
|
- unset(CUDA_ARCH_PTX CACHE)
|
|
+ set(CUDA_ARCH_BIN)
|
|
+ set(CUDA_ARCH_PTX)
|
|
endif()
|
|
endif()
|
|
|
|
@@ -1422,7 +1422,7 @@
|
|
# Solution folders:
|
|
#-----------------------------------
|
|
|
|
-if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")
|
|
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.8)
|
|
set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")
|
|
endif()
|
|
|