Alexander Alekhin
cc09f5a7de
Merge pull request #7854 from alalek:backports_2016
...
(2.4) Backports from master branch (#7854 )
8 years ago
Alexander Alekhin
db6d94a7b0
cmake: minimize MSVS projects layout
...
Also put "object" targets to off by default (they doesn't work well)
8 years ago
Alexander Alekhin
5f269d08b4
bigdata: add test, resolve split/merge issue
8 years ago
Alexander Alekhin
09ce987552
cmake: fix export issue
...
opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)
9 years ago
Matt Leotta
912592de4c
Remove "INSTALL_NAME_DIR lib" target property
...
The INSTALL_NAME_DIR property of a target specifies how a dynamic library should
be found on OS X. If INSTALL_NAME_DIR is not specified the loader will search
relative to the standard search paths. If specified it should either be
an absolute path or relative path prefixed with either @executable_path ,
@load_path , or @rpath . Specifying "lib" does not make sense here and
causes linking error as documented here:
http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library-on-mac-osx/
and here
http://stackoverflow.com/questions/26978806/dyld-library-not-loaded-lib-libopencv-core-3-0-dylib-reason-image-not-found
This patch removes INSTALL_NAME_DIR everywhere it is set to "lib".
An alternate solution would be to set an absolute path like
"${CMAKE_INSTALL_PREFIX}/lib" or relative path like
"@executable_path/../lib". However, if there is not specific need for
specifying a path, it is probably best left unset.
9 years ago
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
9 years ago
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
9 years ago
Maksim Shabunin
84f37d352f
HAL moved back to core
9 years ago
Alexander Alekhin
7afce8e003
world build: fix modules instantiation order
...
opencv_hal before opencv_world
opencv_world before opencv_ts
9 years ago
Alexander Alekhin
fe2f5c175a
distrib: remove useless static files from shared distribution package
9 years ago
Alexander Alekhin
60eda6f25c
export simple libs from OPENCV_LINKER_LIBS ( fix #5541 )
...
(cherry picked from commit 937a096bf1
)
9 years ago
Alexander Alekhin
937a096bf1
export simple libs from OPENCV_LINKER_LIBS ( fix #5541 )
9 years ago
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
9 years ago
Vladislav Vinogradov
d81d51d155
assing labels to targets and sources
9 years ago
Alexander Alekhin
f52cac9d47
fix #5264
9 years ago
Ilya Lavrenov
7746d9b7cc
fix for corrent modules dependencies
...
(cherry picked from commit 1c3d83df54
)
9 years ago
a-andre
226ff93917
install new headers like "opencv2/core.hpp"
9 years ago
Ilya Lavrenov
5eb67cc2cb
fix for corrent modules dependencies
9 years ago
Ilya Lavrenov
1c3d83df54
fix for corrent modules dependencies
9 years ago
Maksim Shabunin
973abf0d62
cmake: Added missing extra modules warning
9 years ago
Ashley Stacey
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
9 years ago
a-andre
5262371660
install new headers like "opencv2/core.hpp"
9 years ago
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
9 years ago
Evgeny Agafonchikov
6a6d58d389
Adding test support for WINRT
10 years ago
Alexander Alekhin
b7cfd5a7da
ocl: added errors processing in OpenCL code generator, resolve space issue
10 years ago
Alexander Alekhin
8184e57dd6
fix tests build (win,shared,world)
10 years ago
Vladislav Vinogradov
653810e4df
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
10 years ago
Alexander Smorkalov
b1cdb91139
Fixed samples install permissions for Debian packaging.
...
(cherry picked from commit cf852972d1
)
10 years ago
Vladislav Vinogradov
3cf265992f
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
(cherry picked from commit f55c1cc0fb
)
10 years ago
Maksim Shabunin
35b2139929
Basic HAL module
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
Maksim Shabunin
37c74e38f4
Python support
10 years ago
Maksim Shabunin
457123027e
Modified java wrapping mechanism
10 years ago
Maksim Shabunin
eb30799aed
Disable object libraries building for cmake 2.8.7 and earlier
10 years ago
Maksim Shabunin
c41db69f98
Fixed cmake issues
10 years ago
Maksim Shabunin
553020c448
Enabled STL usage within the library
10 years ago
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
10 years ago
Alexander Smorkalov
cf852972d1
Fixed samples install permissions for Debian packaging.
10 years ago
Vladislav Vinogradov
124ac15f1e
remove cuda module
10 years ago
Vladislav Vinogradov
698c367d8d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
10 years ago
Vladislav Vinogradov
12a3eb776d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
10 years ago
Vladislav Vinogradov
0376a8643e
fix CMake CMP0054 warning:
...
ported from c105b72945
10 years ago
Claudio Caraffi
efc7dbaae2
Prevent linking failure, bug 4108
10 years ago
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
10 years ago
Maksim Shabunin
c28fea32c7
Build separate world-like iOS framework for contrib
10 years ago
Vladislav Vinogradov
4f8a1213bd
determine test category (Public vs Extra) based on module location
10 years ago
Vladislav Vinogradov
edf54ac3a9
add CTest targets for sanity tests
10 years ago
Vladislav Vinogradov
f44c29ad7d
disable CTest target for opencv_test_viz:
...
opencv_test_viz creates windows and waits until user close them,
it is not appropriate for automatic testing
10 years ago
Vladislav Vinogradov
0c57dc2e00
rewrite add_test command for accuracy tests:
...
* use new syntax introduced in CMake 2.8.0
* set OPENCV_TEST_DATA_PATH enviroment property
10 years ago
Vladislav Vinogradov
f55c1cc0fb
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
10 years ago