opencv

Commit Graph

Author	SHA1	Message	Date
Alexander Alekhin	c6c651212c	cmake: refactoring of OpenCVConfig - removed OpenCV_LIB_DIR* vars (they are broken and not required anymore) - OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support - removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE - fix hard-coded relative paths for OpenCV_INSTALL_PATH - removed OpenCV_TBB_ARCH - switch OpenCVConfig.cmake into 2-level mode for Android SDK	9 years ago
qiao	a7fe73f284	fix OpenCV_CONFIG_PATH get null value after CMake 2.8.11 syntax of cmake "get_filename_component" changed after version 2.8.11 for cmake version < 2.8.11 get_filename_component(<VAR> <FileName> PATH [CACHE]) for cmake version >= 2.8.11 get_filename_component(<VAR> <FileName> DIRECTORY [CACHE]) Update OpenCVConfig.cmake Update OpenCVConfig.cmake.in	9 years ago
Alexander Alekhin	d34297b516	fix include path for windows package	9 years ago
Vincent Rabaud	932043fdc2	Properly check for version in find_package If I ask for version 2, the current trunk version (version 3), will say it is compatible, which is erroneous. Do not consider different major versions compatible in cmake config file	9 years ago
Alexander Alekhin	8f732f2cfe	fix samples deps some tutorials depends on contrib modules	9 years ago
Ruslan Baratov	f30bf39bd4	Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property With this fix there is no need to add includes by using `include_directories(${OpenCV_INCLUDE_DIRS})`. Directory will be added by command `target_link_libraries(... ${OpenCV_LIBS})` automatically.	10 years ago
Maksim Shabunin	caffbaafbe	Updated Manager for Android	10 years ago
Alexander Nitsch	d6c95621e8	Implement CMAKE_CURRENT_LIST_DIR for older CMake The use of built-in CMAKE_CURRENT_LIST_DIR requires at least CMake 2.8.3. This fix properly defines the variable to allow its use in versions < 2.8.3 as well. Fixes issue #4205. Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR This avoids violation of possible future CMake policy checks regarding reserved/read-only variables.	10 years ago
Maksim Shabunin	97c78838a4	Fixed windows build and one warning	10 years ago
Roman Donchenko	6e121b2e29	Use imported targets for linking to CUDA This retains the desirable quality of not including paths to CUDA libraries from the build system into the config files, and has two major advantages: * It removes the need to use link_directories, which doesn't guarantee that the libraries from the supplied directory will be used (there may be libraries with the same names earlier in the search path). * It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable is used with target_link_libraries, where such entries are treated as linker flags, so doing this is unportable. I remove the support for -L entries from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the future.	10 years ago
Roman Donchenko	e6619cf580	Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop There's no reason to do it twice.	10 years ago
Ilya Lavrenov	58b3869730	fixed cross-compilation	10 years ago
Ilya Lavrenov	0832b47d21	fixed cross-compilation for Android with CUDA	10 years ago
Alexander Nitsch	c2944dbc0c	Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR This avoids violation of possible future CMake policy checks regarding reserved/read-only variables.	10 years ago
Alexander Nitsch	9665e08bac	Implement CMAKE_CURRENT_LIST_DIR for older CMake The use of built-in CMAKE_CURRENT_LIST_DIR requires at least CMake 2.8.3. This fix properly defines the variable to allow its use in versions < 2.8.3 as well. Fixes issue #4205.	10 years ago
Philipp Hasper	799646e5d0	Typos in CMake	10 years ago
Michae Gharbi	28103ad386	Fix Cuda -Wl linker options This line causes the following error when building custom projects that use OpenCV beta 3: ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'	10 years ago
Jose-Luis Blanco-Claraco	539acaf348	OpenCVConfig.cmake: Fix CMake CMP0012 warning "TRUE"/"FALSE" should not be used as literals, as CMake has to decide whether they are literals or variable names (sigh). This patch should make it work with any version of CMake and with any user-side decision on old vs. new policy behavior.	10 years ago
Vladislav Vinogradov	10a2c51c52	fix OpenCVConfig.cmake template - missing parentheses (cherry picked from commit `67b562d543`)	10 years ago
Alexander Smorkalov	4664a339ae	Fix non-Android cross compilation with OpenCVConfig.cmake (cherry picked from commit `e8376c789d`)	10 years ago
Alexander Alekhin	55188fe991	world fix	11 years ago
vbystricky	d58f736935	Split highgui module to videoio and highgui	11 years ago
Vladislav Vinogradov	67b562d543	fix OpenCVConfig.cmake template - missing parentheses	11 years ago
Alexander Smorkalov	e8376c789d	Fix non-Android cross compilation with OpenCVConfig.cmake	11 years ago
Alexander Alekhin	df9aa8898d	icv: fix OpenCV Windows package	11 years ago
Alexander Smorkalov	b852108262	OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.	11 years ago
Alexander Smorkalov	6b8de222d7	OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.	11 years ago
Roman Donchenko	ef27ac3782	In the example in OpenCVConfig.cmake.in, explicitly add the include paths. After #1801, the include directories are no longer added automatically, so we should show the user how to do that.	11 years ago
Roman Donchenko	7f935717cb	In OpenCVConfig.cmake.in, lowercased the commands in the example. This is the preferred style nowadays, and more consistent with the rest of the code.	11 years ago
Roman Donchenko	4037a4f227	Fixed OpenCV_LIBS when find_package has been used with explicit components. Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.	11 years ago
Roman Donchenko	615d6c22d1	Switched OpenCV to a 3-component version number. Epoch is gone; now the version component names in C++ and CMake are consistent (except REVISION corresponds to PATCH).	11 years ago
Vincent Rabaud	154d119e13	do not use include_directories when calling find_package(OpenCV) This is something that should be left to the user, that's the whole point of OpenCV_INCLUDE_DIRS.	11 years ago
Vincent Rabaud	8e944cfe70	cleaner fix	11 years ago
Vincent Rabaud	ee7c74ceeb	return when OpenCV is found	11 years ago
Vincent Rabaud	9007a02302	fixes http://code.opencv.org/issues/3367	11 years ago
Roman Donchenko	c016c43d25	Fixed Android SDK build - again.	11 years ago
Alexander Alekhin	7a8f9fe746	cmake: fix android installation for different NDK ABIs	11 years ago
Alexander Alekhin	9941d3f71a	cmake: restore find_package() for build directory	11 years ago
Alexander Alekhin	fbe7448250	cmake: export OpenCVModules for unix 'install', move macros desclarations	11 years ago
Alexander Alekhin	555c505b70	update cmake 'install' target for Windows platform Allow to build samples via OpenCV binaries from distribution package (find_package with OpenCV_DIR).	11 years ago
Vladislav Vinogradov	adc516becc	fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit	11 years ago
Roman Donchenko	473bfb0019	Updated the build config files to deal with the version status. I didn't make the status part of the version variables here, because letters don't play too well with version comparison algorithms (especially with CMake's, which only supports numbers).	11 years ago
Vladislav Vinogradov	ecb2ebfba4	Move opengl iterop code to cv::ogl namespace Fixed issues: #2737 #2848	12 years ago
Andrey Kamaev	1094179155	Avoid build falure in armeabi build with Android SDK	12 years ago
Vladislav Vinogradov	61ef48eee6	fixed OpenCVConfig for cross-compilation: * added CUDA to EXTRA libs if OpenCV uses it * added -rpath-link option for linker if OpenCV was built as SHARED libs	12 years ago
Vincent Rabaud	c7bbd1aef2	Update cmake/templates/OpenCVConfig.cmake.in find_package(OpenCV) should not include_directories by default, that is not standard afaik. Plus that creates problems when creating the ROS package :)	12 years ago
Andrey Kamaev	024185b9ed	Fix OpenCVConfig.cmake generated for Android platform (issue #2496 ) * fix path to libraries in Android SDK * allow to link to opencv_java.so as Android.mk does To link to opencv_java.so you can either change your cmake to find OpenCV as find_package(OpenCV opencv_java) or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command	12 years ago
Vladislav Vinogradov	78c924baad	removed obsolete CARMA toolchain and CMake variable	12 years ago
Vladislav Vinogradov	395f0201e3	fixed build for CARMA: - added CMake toolchain file - added WITH_NVCUVID flag	12 years ago
Andrey Kamaev	e3474878b6	Consistently use 4-digit library version	12 years ago

1 2

73 Commits (e4cd24537e4d3152bb5631a3e45ab8850e3b0f5c)