Roman Donchenko
0387f8ad56
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
...
Absolute destinations are not necessary, and prevent CPack from working.
10 years ago
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
11 years ago
Alexander Smorkalov
3ebdcafdd3
All installed files marked with component names for install customization.
...
(cherry picked from commit b75cbfde45
)
Conflicts:
cmake/OpenCVModule.cmake
11 years ago
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
11 years ago
Roman Donchenko
7973594a01
Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.
...
If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
then the resulting path becomes absolute.
Fixes <http://code.opencv.org/issues/3350 >.
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
Alexander Smorkalov
20fef00a77
android -> plarforms/android
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
cuda_geek
6b19c76233
fix hardcoded paths for static build OpenCV with CUDA
12 years ago
Andrey Kamaev
682dede87e
#2215 Fix dependencies escaping in generated OpenCVConfig.cmake
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
Andrey Kamaev
c3577a288b
Merged the trunk r8291:8321
13 years ago
Marina Kolpakova
6e6271d995
Debug/Release folders fix for QTCreator build
13 years ago
Andrey Kamaev
7d51a4ab78
#1416 added option to install OpenCVConfig.cmake i arch-dependent lo
13 years ago
Andrey Morozov
52b4536d39
fixed module name for mingw compiler under Windows
13 years ago
Andrey Kamaev
212ceb3e24
Minor improvement for Android TBB
13 years ago
Andrey Kamaev
4f97b20ff6
Refactored OpenCVConfig.cmake generation code.
13 years ago
Andrey Kamaev
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
13 years ago
Andrey Kamaev
68a54e7f3c
Fixed incorrectly merged patch.
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
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