Permalink
Browse files

Pristine Unix sources for OpenCV 2.4.1

  • Loading branch information...
1 parent 4800530 commit c0231c6c564514810b05c668290bb435b9f7c54d @hungc hungc committed Jun 19, 2012
Showing 1,521 changed files with 221,263 additions and 110,974 deletions.
View
@@ -1,18 +0,0 @@
-if(NOT ZLIB_FOUND)
- add_subdirectory(zlib)
-endif()
-if(WITH_JASPER AND NOT JASPER_FOUND)
- add_subdirectory(libjasper)
-endif()
-if(WITH_JPEG AND NOT JPEG_FOUND)
- add_subdirectory(libjpeg)
-endif()
-if(WITH_PNG AND NOT PNG_FOUND)
- add_subdirectory(libpng)
-endif()
-if(WITH_TIFF AND NOT TIFF_FOUND)
- add_subdirectory(libtiff)
-endif()
-if(WIN32)
- add_subdirectory(ffmpeg)
-endif()
@@ -1,20 +0,0 @@
-project(opencv_ffmpeg)
-
-if(MSVC64 OR MINGW64)
- set(FFMPEG_SUFFIX _64)
-endif()
-
-set(module_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll")
-set(module_name "${CMAKE_CURRENT_SOURCE_DIR}/${module_bare_name}")
-
-get_target_property(bin_dir opencv_traincascade LOCATION)
-get_filename_component(bin_dir ${bin_dir} PATH)
-
-message(STATUS "ffmpeg output dir: ${bin_dir}")
-
-add_custom_target(opencv_ffmpeg ALL
- COMMAND ${CMAKE_COMMAND} -E copy
- ${module_name} ${bin_dir}/${module_bare_name}
- COMMENT "Copying ${module_name} to the output directory")
-
-install(FILES ${module_name} DESTINATION bin COMPONENT main)
@@ -0,0 +1,11 @@
+set(NEW_FFMPEG 1)
+set(HAVE_FFMPEG_CODEC 1)
+set(HAVE_FFMPEG_FORMAT 1)
+set(HAVE_FFMPEG_UTIL 1)
+set(HAVE_FFMPEG_SWSCALE 1)
+set(HAVE_GENTOO_FFMPEG 1)
+
+set(ALIASOF_libavcodec_VERSION 53.61.100)
+set(ALIASOF_libavformat_VERSION 53.32.100)
+set(ALIASOF_libavutil_VERSION 51.35.100)
+set(ALIASOF_libswscale_VERSION 2.1.100)
Oops, something went wrong.

0 comments on commit c0231c6

Please sign in to comment.