Vladislav Vinogradov
67b562d543
fix OpenCVConfig.cmake template - missing parentheses
2014-05-13 11:37:21 +04:00
Alexander Smorkalov
e8376c789d
Fix non-Android cross compilation with OpenCVConfig.cmake
2014-05-12 15:45:02 +04:00
Alexander Smorkalov
b852108262
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
2014-03-28 18:57:21 +04:00
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
2014-03-22 05:41:29 +04:00
Alexander Smorkalov
b0ad84cfa2
Libraries filter update after abs path cut.
2014-03-21 12:48:38 +04:00
Alexander Smorkalov
284b2fc1e7
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
2014-03-19 18:47:32 +04:00
Roman Donchenko
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Roman Donchenko
ae036838dd
Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix
2014-03-17 14:43:15 +04:00
Alexander Smorkalov
6b8de222d7
OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.
2014-03-17 14:32:32 +04:00
Roman Donchenko
836635d2d5
Merge pull request #2434 from Nerei:viz_continue
2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25
minor cmake fix fo macos
2014-03-12 16:22:22 +04:00
Alexander Smorkalov
b3e18d23a3
Implicit CUDA and OpenCL control for module definition added.
...
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
2014-03-06 10:31:33 +04:00
Roman Donchenko
7cbc4e88de
Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux
2014-02-19 12:02:41 +04:00
Roman Donchenko
5cb2d1c20d
Merge pull request #2338 from asmorkalov:ocv_gcov
2014-02-18 14:25:16 +04:00
Alexander Smorkalov
de6d13088f
gcov tool support added.
2014-02-18 12:59:41 +04:00
Alexander Karsakov
01a980aa9e
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
2014-02-17 16:56:02 +04:00
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +04:00
Roman Donchenko
fa272c43c2
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
2014-02-14 15:37:09 +04:00
Stuart Cunningham
55b9c0374c
Fix cmake detection of build platform endianness
...
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
2014-02-13 22:59:30 +11:00
Alexander Smorkalov
d02c291160
opencv_run_all_tests.sh implemented for Android SDK.
2014-02-12 14:21:58 +04:00
Ilya Lavrenov
281666887e
typo
2014-02-11 14:25:37 +04:00
Anatoly Baksheev
5dc17f5d58
Fixed all OpenGL issues for Macos (via objective-C++ layer)
2014-02-10 15:45:46 +04:00
Anatoly Baksheev
975a6299fa
More proper OpneCv+Qt+Vtk issues handling ( http://code.opencv.org/issues/3492 )
2014-02-10 15:45:44 +04:00
Alexander Smorkalov
b10d4b05ed
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
2014-02-07 12:46:24 +04:00
Roman Donchenko
34b02f6437
Merge pull request #2276 from asmorkalov:android_install_cuda
2014-02-06 16:45:49 +04:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Roman Donchenko
e91b818e3e
Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix
2014-02-06 14:59:31 +04:00
Alexander Smorkalov
530702c5f2
Absolute path to tests in opencv_run_app_tests.sh fixed.
2014-02-06 12:35:14 +04:00
Roman Donchenko
feed2c074d
Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix
2014-02-06 12:20:08 +04:00
Alexander Smorkalov
65b4d77959
project.properties file generation fixed for per-component installation.
2014-02-05 17:34:19 +04:00
Vladislav Vinogradov
286fe261d0
save previous values of LOCAL_* variables and restore them at the end
2014-02-04 10:29:43 +04:00
Vladislav Vinogradov
a098fb1803
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)
2014-02-04 10:29:15 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Alexander Smorkalov
3d261e8a01
Reports path fix for opencv_run_all_tests.sh.in script.
2014-01-31 13:17:12 +04:00
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
2014-01-29 19:34:02 +04:00
Alexander Smorkalov
d45350a06a
opencv_run_all_tests.sh script added to -tests package.
2014-01-29 16:31:24 +04:00
Alexander Smorkalov
d9dc5ffa91
Multiple fixes for tests deb package build.
...
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
2014-01-28 16:32:26 +04:00
Alexander Smorkalov
39201e68e2
Code review notes fixed.
...
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
2014-01-27 18:47:09 +04:00
Alexander Smorkalov
f332cba14b
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
2014-01-27 15:49:24 +04:00
Roman Donchenko
24caa80143
Merge pull request #2197 from asmorkalov:ocv_packaging2
2014-01-24 14:27:44 +04:00
Alexander Smorkalov
086792ec06
Improvements in package build.
2014-01-24 12:00:44 +04:00
Anatoly Baksheev
9145985ff4
added guard to prevent linking VTK with Qt5
2014-01-23 16:40:24 +04:00
Roman Donchenko
3715f71aaf
Merge pull request #2175 from vrabaud:2.4
2014-01-23 13:27:38 +04:00
Vincent Rabaud
167a26642e
fix message sent to user during cross_compilation
2014-01-22 15:26:14 +01:00
Alexander Smorkalov
7821fe2bde
Initial Linux packages build rools for CPack.
2014-01-21 20:34:36 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Vincent Rabaud
eabcfa5652
reorder the if's for clarity
2014-01-21 10:27:37 +01:00
Vincent Rabaud
6cb90c0e97
fix cross-compilation issue with Numpy
2014-01-21 10:07:19 +01:00
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
Roman Donchenko
719149877e
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
2013-12-27 12:43:49 +04:00
Roman Donchenko
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
GregoryMorse
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
Roman Donchenko
86aabf704f
Merge pull request #2050 from asmorkalov:android_mk_fix2
2013-12-26 14:16:29 +04:00
Alexander Smorkalov
358e59e91b
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
2013-12-26 13:07:53 +04:00
Roman Donchenko
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
2013-12-25 14:04:44 +04:00
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
2013-12-23 16:40:31 +04:00
Alexander Smorkalov
58e7d9f32f
OpenCV.mk fixed for accurate CUDA support.
2013-12-23 12:58:12 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Alexander Smorkalov
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
2013-12-20 16:02:37 +04:00
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +04:00
Vladimir Bystricky
d449ba104a
Fix comment in the cmake file from SSDK to SDK
2013-12-19 10:29:19 +04:00
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
2013-12-19 10:27:38 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
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
Alexander Alekhin
4adede4246
cmake: python module updates
2013-10-09 17:49:11 +04:00
Alexander Alekhin
47dd44e490
cmake: OpenCVConfig.cmake: fix message
2013-10-09 17:49:11 +04:00
Alexander Alekhin
034a77c26d
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
2013-10-09 17:49:10 +04:00
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).
2013-10-09 17:49:10 +04:00
Roman Donchenko
df213241cc
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
2013-10-04 18:15:05 +04:00
Vladislav Vinogradov
adc516becc
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
2013-10-04 15:14:21 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Vladislav Vinogradov
4e4d2da0b9
fix #3296 : Unsupported gpu architecture 'compute_21'
2013-10-03 10:21:00 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Alexander Smorkalov
308fbeb04b
Make libv4l support optional for testing purposes.
2013-09-30 12:44:59 +04:00
Alexander Alekhin
b4a534a235
cmake: PCH: use DEFINE_SYMBOL target property
2013-09-25 12:27:08 +04:00
Alexander Alekhin
48774a39b4
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-25 12:27:08 +04:00
Alexander Alekhin
ce557fb7be
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
...
This reverts commit 286244efed
.
2013-09-24 15:12:24 +04:00
Alexander Alekhin
286244efed
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-21 21:12:39 +04:00
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
e5735282da
Added the ability to have samples inside a module.
2013-09-04 18:41:19 +04:00
Alexander Smorkalov
ebe7f00cb4
/apicontainer added to linker flags on WinRT to fix api test issues.
2013-08-28 08:36:57 -07:00
Roman Donchenko
7cefb6f50b
Merge pull request #1335 from alekcac:ios-build-fix
2013-08-23 16:54:48 +04:00
Alexander Shishkov
88712d97c6
fix CMake changes
2013-08-23 16:09:41 +04:00
Roman Donchenko
9bb1a7d34d
Merge pull request #1234 from SpecLad:ios-plist
2013-08-23 15:43:08 +04:00
Alexander Shishkov
396f6bb55f
fixed problems with building iOS version
2013-08-23 13:41:19 +04:00
Roman Donchenko
e1397f6c1f
Merge pull request #1324 from SpecLad:try-compile
2013-08-23 12:06:57 +04:00
Roman Donchenko
10860783ef
Added warnings-as-errors support for MSVC.
2013-08-22 18:25:38 +04:00
Roman Donchenko
a9e9ce859e
Fix errors in usages of try_compile
...
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
2013-08-22 15:56:35 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ad7073bc22
Merge pull request #1305 from SpecLad:perf-precomp
2013-08-21 18:34:48 +04:00
Roman Donchenko
868e355e33
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
2013-08-21 13:32:27 +04:00
kdrobnyh
ea5dd74af1
Add IPP 8.0 support in FindIPP script
2013-08-21 13:02:18 +04:00
Roman Donchenko
9667a8a1ae
Fix the name of perf tests' precompiled header.
...
(cherry picked from commit aa96d8d053
)
2013-08-20 14:54:31 +04:00
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
2013-08-16 05:22:54 -07:00