Alexander Alekhin
cc09f5a7de
Merge pull request #7854 from alalek:backports_2016
...
(2.4) Backports from master branch (#7854 )
8 years ago
Alexander Alekhin
540ece74a5
cmake: support ICC warnings
8 years ago
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
8 years ago
mshabunin
695c518384
Updated TBB search script and code checks
8 years ago
Alexander Alekhin
71b2409df0
ts: added findDataFile() utility function and SkipTestException
8 years ago
Alexander Alekhin
32f568308a
cmake: cleanup ffmpeg detection
8 years ago
Alexander Alekhin
5ac15f09ed
cmake: add DEBUG_PRE/DEBUG_POST commands handling
...
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
8 years ago
Alexander Alekhin
36d7712c2c
cmake: CMakeVars.txt (for debugging purpose)
8 years ago
Alexander Alekhin
e5041abe55
cmake: remove outdated pkg-config module
8 years ago
Alexander Alekhin
6cfe4a85f7
cmake: fix ocv_check_compiler_flag
8 years ago
Alexander Alekhin
b640e72877
cmake: update PCH
...
1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS
8 years ago
Alexander Alekhin
c181f2f493
cmake: fix for GCC 6.x
8 years ago
Alexander Alekhin
21d9412c93
cmake: fix for GCC 6.x
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
9 years ago
Alexander Alekhin
c5a8619493
cmake: fix install path
...
CMake doesn't work with empty paths ("") or paths which contains "./"
9 years ago
Alexander Alekhin
f57e3ce5f3
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
...
CPack can't work with absolute paths.
9 years ago
Alexander Alekhin
c6c651212c
cmake: refactoring of OpenCVConfig
...
- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK
9 years ago
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
9 years ago
Alexander Alekhin
9393a0c5bb
cmake: don't use -isystem for opencv_contrib paths
9 years ago
Alexander Alekhin
8f37a3a37c
cmake: make ocv_cmake_dump_vars() case insensitive
9 years ago
Alexander Alekhin
9cd6731894
cmake: add DEBUG_PRE/DEBUG_POST commands handling
...
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
9 years ago
Alexander Alekhin
c8ff7a4867
build: fix opencv_world with CUDA
9 years ago
Alexander Alekhin
24dbb43c09
pkg-config: modules list contains only OpenCV modules ( fixes #5852 )
9 years ago
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
9 years ago
Alexander Alekhin
2bfad68812
pkg-config: remove $<LINK_ONLY:...> expressions
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
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
Alexander Alekhin
56ad207d37
update ffmpeg wrapper binaries
...
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
10 years ago
Alexander Alekhin
f11ed4b91d
fix "non target" warning for "world" build
10 years ago
Alexander Alekhin
1ce0ef9d41
fix build without IPP (and empty 3rdparty)
10 years ago
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
10 years ago
Maksim Shabunin
f803c2a7bb
Generators: updated the library gathering loop
10 years ago
Maksim Shabunin
979721c979
Fix generating of android.mk
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
Roman Donchenko
122b9f8e17
Turn ocv_convert_to_lib_name into a function
10 years ago
Maksim Shabunin
eb30799aed
Disable object libraries building for cmake 2.8.7 and earlier
10 years ago
Maksim Shabunin
2085251df2
Exclude object libraries from visual studio solution build
10 years ago
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
10 years ago
Vladislav Vinogradov
0376a8643e
fix CMake CMP0054 warning:
...
ported from c105b72945
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
571ebb2373
Fixing iOS clang warnings, part 3
10 years ago
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
10 years ago
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
10 years ago
Vladislav Vinogradov
f5d9359da8
use directory-based include_directories command if we build with CUDA
10 years ago
Vladislav Vinogradov
0825120f6a
move CUDA compilation step from ocv_glob_module_sources to ocv_add_library
10 years ago
Alexander Alekhin
55188fe991
world fix
10 years ago
vbystricky
d58f736935
Split highgui module to videoio and highgui
11 years ago