772fcf4088
Merge pull request #3893 from SpecLad:cuda-imported-targets
2015-04-02 13:56:31 +00:00
100c2dd91c
Merge pull request #3852 from renko:multithread_cl_not_studio_generator
2015-04-01 13:25:39 +00:00
58c9135626
Not block PDB file in multithreaded build on Windows.
...
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
2015-04-01 13:52:07 +03:00
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.
2015-03-31 13:46:28 +03:00
e6619cf580
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
...
There's no reason to do it twice.
2015-03-30 15:04:27 +03:00
122b9f8e17
Turn ocv_convert_to_lib_name into a function
2015-03-30 14:58:37 +03:00
ebd7d08408
fix bug 4269
2015-03-30 00:01:20 +08:00
d430664791
Remove local variables from CMAKE namespace
2015-03-24 14:42:55 +01:00
13694c8ae8
Fix MinGW detection on x86
...
Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.
2015-03-07 15:49:48 +01:00
dde7c22fad
Fix MinGW architecture detection
...
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
2015-03-07 15:37:21 +01:00
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
2015-03-02 10:55:00 +00:00
a5b293b412
Fix setting of architecture for MinGW builds
...
The architecture has been correctly determined earlier in this
file. No need to do it again.
2015-02-24 23:13:27 +01:00
96d7bcc2a9
Merge pull request #3677 from ilya-lavrenov:cuda_backport
2015-02-24 15:06:15 +00:00
e03136e951
backport from master
2015-02-24 16:05:21 +03:00
1c6e9fdfae
Merge pull request #3735 from SpecLad:align-cpack-variables
2015-02-24 11:42:40 +00:00
8ae6402799
Fix MinGW detection on x86
...
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.
Since we are actually interested in finding the "64" in the
triplet's operating system key, this fix makes sure to look for
"mingw64" and thus avoids the false match.
Fixes issue #3835 . Credits to Lode Leroy for the original patch.
2015-02-23 15:03:28 +01:00
0832b47d21
fixed cross-compilation for Android with CUDA
2015-02-22 13:18:57 +03:00
dcc569ee5c
Merge pull request #3721 from nitsch:fix-cmake-current-list-dir
2015-02-21 16:49:36 +00:00
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.
2015-02-20 19:55:46 +01:00
cf54e3b97e
Mark the libs component required
...
Everything else depends on it, after all.
2015-02-20 18:37:21 +03:00
6d52ea8984
Add component display names
2015-02-20 18:22:01 +03:00
b8c60234c3
Update the CPack variables to match the changes in asmorkalov/CMake#1
...
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
2015-02-20 18:21:47 +03:00
c1e3ca170e
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
2015-02-20 12:38:25 +03:00
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 .
2015-02-20 00:55:26 +01:00
a649aea82a
Merge pull request #3699 from SpecLad:rm-component-install
2015-02-18 13:55:07 +00:00
4fcfcfd002
Merge pull request #3663 from eliteraspberries:ffmpeg-dylib
2015-02-18 12:50:10 +00:00
49fe496914
Remove useless CPACK_*_COMPONENT_INSTALL variables
...
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
2015-02-13 15:31:19 +03:00
0387f8ad56
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
...
Absolute destinations are not necessary, and prevent CPack from working.
2015-02-10 19:43:29 +03:00
682fdcfc9b
make color output in run_test script optional
2015-02-09 15:23:34 +03:00
94d14c637f
fix opencv_run_all_tests_unix.sh script:
...
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
2015-02-06 12:34:50 +03:00
98f9a013d1
Merge pull request #3674 from jet47:colorize-run-test-script-2.4
2015-02-05 07:35:01 +00:00
c60fa84027
Add back the version variables removed in ab40630f.
2015-02-04 10:55:38 -05:00
a87ccb9ac0
Added Debian changelog to -tests package.
2015-02-04 16:52:39 +03:00
2b303f38a8
colorize opencv_run_all_tests_unix.sh script output
2015-02-04 12:38:51 +03:00
e6ac64008b
Debian package names replaced by lower case version to satisfy lintian.
2015-02-04 11:56:29 +03:00
8c68f1f626
Fix indentation of 98a157f5.
2015-02-03 23:17:43 -05:00
98a157f589
Remove Apple-specific logic in finding the FFmpeg libraries.
...
Thanks to SpecLad.
2015-02-03 23:14:11 -05:00
a1cc9380e5
Correct the new find_library commands.
...
Thanks to SpecLad.
2015-02-02 11:54:09 -05:00
ab40630ff4
Use the CMake find_library command to find the FFmpeg libraries.
2015-02-01 15:51:33 -05:00
cf852972d1
Fixed samples install permissions for Debian packaging.
2015-02-01 00:34:23 +03:00
1f47c22371
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh
2015-01-31 14:46:40 +00:00
602b034a03
Merge pull request #3658 from asmorkalov:numpy_dependency
2015-01-31 14:45:11 +00:00
ddc1b965b6
Added Debian changelog installation step for Debian package generation.
2015-01-30 13:21:52 +03:00
be6b847675
Added dependency from numpy to debian package with python bindings.
2015-01-30 12:27:33 +03:00
9206ec30a2
opencv_testing.sh script installation is removed as run tests script does the same thing.
2015-01-29 19:20:18 +03:00
c29c52a216
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4
2015-01-20 12:34:50 +00:00
396f7e1a17
Merge pull request #3604 from asmorkalov:ocv_samples_package
2015-01-16 10:23:32 +00:00
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
2015-01-16 10:59:52 +03:00
6628714fc6
Fixed -samples debian package dependencies.
2015-01-15 15:36:45 +03:00
9cadc1e530
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
2015-01-13 11:25:32 +00:00
Alexander Smorkalov