Alexander Smorkalov
358e59e91b
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
11 years ago
Roman Donchenko
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
11 years ago
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
11 years ago
Alexander Smorkalov
58e7d9f32f
OpenCV.mk fixed for accurate CUDA support.
11 years ago
Alexander Smorkalov
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
11 years ago
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
11 years ago
Vladimir Bystricky
d449ba104a
Fix comment in the cmake file from SSDK to SDK
11 years ago
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
11 years ago
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
11 years ago
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
11 years ago
Alexander Smorkalov
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
11 years ago
Vladislav Vinogradov
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
11 years ago
Vladislav Vinogradov
81acc5e73e
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
11 years ago
Vladislav Vinogradov
26cb0ce1d5
fixed compilation warnings in .cu files
11 years ago
Vladislav Vinogradov
20641b4a0b
fixed CC arch/pts for android (used sm_32)
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
239704f986
Added Visual Studio 2013 detection.
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
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
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
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
11 years ago
Roman Donchenko
104b14e0e0
Fixed CMake warnings/bugs caused by #1670 and #1714
...
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.
Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
11 years ago
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
11 years ago
Vladislav Vinogradov
5e75a22559
fixed find package CUDA for cross-compilation
...
replaced find_host_package with find_package and
set CMAKE_FIND_ROOT_PATH_MODE_LIBRARY to BOTH, because NEVER
doesn't work for CUDA_CUDA_LIBRARY, which is located in
/usr/arm-linux-gnueabihf/lib/libcuda.so for ARM
11 years ago
Vladislav Vinogradov
06c1f9a329
added own version of FindCUDA.cmake
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
Roman Donchenko
76b904b022
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
...
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
11 years ago
Alexander Alekhin
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
11 years ago
Vladislav Vinogradov
e5947f581a
fix CUDA 5.5 support (npp, arm cross compilation) in CMake scripts:
...
The patch was submitted to CMake and might be available
in the next CMake release.
But until we have the fix in CMake we should add workaround in our scripts.
11 years ago
Alexander Alekhin
d571b28eaa
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
11 years ago
Roman Donchenko
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
11 years ago
Greg Hale
387587f4f0
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
11 years ago
Greg Hale
fe3dd762a4
fixed wrong regex
11 years ago
Alexander Alekhin
cfc3b9abbb
ocl: workaround for msvc11 bug
...
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
11 years ago
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
11 years ago
Alexander Alekhin
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
11 years ago
Greg Hale
0c4d484679
added backslash
11 years ago
Greg Hale
61ccd170bd
shortened code to not repeat myself
11 years ago
Greg Hale
5bd5993663
Only append -l to lib entries with no path and no -l or -L of their own
11 years ago
Alexander Alekhin
9941d3f71a
cmake: restore find_package() for build directory
11 years ago
Greg Hale
70df365c87
changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list
11 years ago
Greg Hale
f23b51de6f
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
11 years ago
Alexander Alekhin
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
11 years ago
Alexander Alekhin
fbe7448250
cmake: export OpenCVModules for unix 'install', move macros desclarations
11 years ago
Alexander Alekhin
4adede4246
cmake: python module updates
11 years ago
Alexander Alekhin
47dd44e490
cmake: OpenCVConfig.cmake: fix message
11 years ago
Alexander Alekhin
034a77c26d
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
11 years ago