Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Alexander Smorkalov
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
2013-11-29 15:34:50 +04:00
Vladislav Vinogradov
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
2013-11-28 13:35:23 +04:00
Vladislav Vinogradov
81acc5e73e
added -Xptxas;-dlcm=ca and -target-os-variant=Android to nvcc flags
2013-11-28 10:00:55 +04:00
Vladislav Vinogradov
26cb0ce1d5
fixed compilation warnings in .cu files
2013-11-28 10:00:48 +04:00
Vladislav Vinogradov
20641b4a0b
fixed CC arch/pts for android (used sm_32)
2013-11-28 10:00:47 +04:00
Roman Donchenko
75fba08042
Merge pull request #1822 from SpecLad:msvc12
2013-11-25 12:19:58 +04:00
Roman Donchenko
b8f5fcf3f9
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
2013-11-21 12:03:02 +04:00
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/ >.
2013-11-19 18:44:17 +04:00
Roman Donchenko
239704f986
Added Visual Studio 2013 detection.
2013-11-18 19:39:39 +04:00
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 >.
2013-11-18 19:21:31 +04:00
Roman Donchenko
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
2013-11-14 19:14:38 +04:00
Vincent Rabaud
8e944cfe70
cleaner fix
2013-11-14 11:45:42 +01:00
Vincent Rabaud
ee7c74ceeb
return when OpenCV is found
2013-11-13 14:20:09 +01:00
Vincent Rabaud
9007a02302
fixes http://code.opencv.org/issues/3367
2013-11-13 12:25:44 +01:00
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
2013-11-10 17:46:59 +01:00
Roman Donchenko
27ae6eb1f4
Merge pull request #1720 from SpecLad:cmp0017
2013-10-30 17:46:33 +04:00
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.
2013-10-30 16:21:50 +04:00
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.
2013-10-30 14:07:34 +04:00
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
2013-10-30 12:10:35 +04:00
Roman Donchenko
957c85e9c4
Merge pull request #1670 from jet47:cuda-cmake-fix
2013-10-29 13:24:14 +04:00
Vladislav Vinogradov
06c1f9a329
added own version of FindCUDA.cmake
2013-10-28 10:09:16 +04:00
Roman Donchenko
c1223f8dac
Merge pull request #1697 from SpecLad:sdk-redux
2013-10-25 20:32:04 +04:00
Roman Donchenko
90f8906e1e
Merge pull request #1690 from SpecLad:cmake-2.8.12
2013-10-25 19:24:58 +04:00
Roman Donchenko
c016c43d25
Fixed Android SDK build - again.
2013-10-25 19:12:32 +04:00
Alexander Alekhin
7a8f9fe746
cmake: fix android installation for different NDK ABIs
2013-10-25 17:17:00 +04:00
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.
2013-10-25 14:19:02 +04:00
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").
2013-10-24 19:04:59 +04:00
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.
2013-10-24 18:17:36 +04:00
Roman Donchenko
f0bc253d0e
Merge pull request #1667 from SpecLad:detect-openmp
2013-10-24 15:00:27 +04:00
Roman Donchenko
119cdc57e9
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
2013-10-24 14:18:12 +04:00
Alexander Alekhin
d571b28eaa
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
2013-10-23 20:28:22 +04:00
Roman Donchenko
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
2013-10-22 18:47:37 +04:00
Greg Hale
387587f4f0
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
2013-10-21 09:27:04 -04:00
Roman Donchenko
a54d36bde8
Merge pull request #1646 from alalek:ocl_fix_msvc11
2013-10-21 16:53:24 +04:00
Roman Donchenko
bfd8acbbc3
Merge pull request #1556 from jet47:fix-bug-3296
2013-10-21 16:28:00 +04:00
Greg Hale
fe3dd762a4
fixed wrong regex
2013-10-19 17:30:32 -04:00
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.
2013-10-18 20:52:36 +04:00
Andrey Pavlenko
d50f0d2ed2
Merge pull request #1587 from alalek:opencl_khronos_headers
2013-10-18 18:41:13 +04:00
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
Alexander Alekhin
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
2013-10-17 23:43:33 +04:00
Greg Hale
0c4d484679
added backslash
2013-10-17 14:17:49 -04:00
Greg Hale
61ccd170bd
shortened code to not repeat myself
2013-10-17 14:12:02 -04:00
Greg Hale
5bd5993663
Only append -l to lib entries with no path and no -l or -L of their own
2013-10-17 14:05:06 -04:00
Alexander Alekhin
9941d3f71a
cmake: restore find_package() for build directory
2013-10-15 23:05:40 +04:00
Greg Hale
70df365c87
changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list
2013-10-15 14:54:58 -04:00
Greg Hale
f23b51de6f
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
2013-10-14 13:36:07 -04:00
Andrey Pavlenko
3b1c53fa8d
Merge pull request #1551 from alalek:cmake_install_win
2013-10-10 18:20:35 +04:00
Alexander Alekhin
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
2013-10-10 00:15:02 +04:00
Alexander Alekhin
fbe7448250
cmake: export OpenCVModules for unix 'install', move macros desclarations
2013-10-09 18:29:03 +04:00
