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
cuda_geek
6b19c76233
fix hardcoded paths for static build OpenCV with CUDA
12 years ago
Marina Kolpakova
b28b2428f6
changing package layout after 'make install' for Android build
13 years ago
Andrey Kamaev
15e50420bc
Fixed linux and android install
13 years ago
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
ce32b4792f
Made OpenCVConfig.cmake friendly to Windows pack
13 years ago
Andrey Kamaev
7d51a4ab78
#1416 added option to install OpenCVConfig.cmake i arch-dependent lo
13 years ago
Andrey Kamaev
16fb7d231e
Fixed problem with Android native camera helper libraries
13 years ago
Andrey Kamaev
504262d3d8
Fixed #1608
13 years ago
Andrey Kamaev
4f97b20ff6
Refactored OpenCVConfig.cmake generation code.
13 years ago
Andrey Kamaev
68a54e7f3c
Fixed incorrectly merged patch.
13 years ago
Leonid Beynenson
3ef5bfa185
Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue.
13 years ago
Vadim Pisarevsky
a618b774f2
fixed OpenCVConfig.cmake for creating Xcode projects
13 years ago
Andrey Kamaev
23af203e00
Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
13 years ago
Andrey Kamaev
1e79280be1
Fixed OpenCVConfig.cmake generated for build directory
13 years ago
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
13 years ago
Andrey Kamaev
8cab65c173
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
13 years ago
Andrey Pavlenko
f24e16f54d
adding Android-specific linking flags
13 years ago
Andrey Pavlenko
2d815c80a5
adding Android-specific libs
13 years ago
Andrey Kamaev
7d190084b3
Fixed #1469
13 years ago
Andrey Kamaev
255617ffe5
OpenCVConfig.cmake is updated to export OpenCV_SOURCE_PATH when used without "make install"
13 years ago
Andrey Kamaev
c08dab0c52
Fixed modules order in OpenCVConfig.cmake
13 years ago
Alexey Spizhevoy
f515337beb
Added handling of stitching module into OpenCVConfig.cmake.in
13 years ago
Vadim Pisarevsky
5678464f7d
fixed OpenCVConfig.cmake for statically built OpenCV on Mac
14 years ago
Andrey Kamaev
ff8fe39e23
removed duplicated compiler flags assignment
14 years ago