Commit Graph

51 Commits

Author SHA1 Message Date
Rok Mandeljc
c35fd55b0e Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
Yantao Xie
6b00c4e337 Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab. 2014-02-13 23:53:58 +08:00
ytxie
3d3b310ae1 Fix the bug 3440. 2013-12-26 17:54:05 +08:00
Leszek Swirski
6e4fb8f275 Replace $(Configuration) with $<CONFIGURATION> 2013-10-24 18:20:16 +01:00
hbristow
86b7e3d15d Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1) 2013-09-15 17:36:13 +10:00
hbristow
530ad447bc Added fixes to CMakeLists.txt 2013-09-13 17:22:12 +10:00
hbristow
7e5bbec895 Removing trailing whitespace and expanded tabs 2013-09-03 10:14:45 +10:00
hbristow
1d25e5f1ba manually added optical flow header to build 2013-09-01 17:10:44 +10:00
hbristow
78dc2c5423 Upadated include tree to match the rest of opencv. Added install configuration for custom mex compiler 2013-08-28 17:06:19 +10:00
hbristow
52dc51a62c Added custom OpenCV mex compiler 2013-08-28 12:01:34 +10:00
hbristow
a659562c36 Changed command-line separator from module:file to module=file so that it works cross-platform 2013-08-08 05:26:56 +10:00
hbristow
059d63cceb Added diagnostic/build information function 2013-08-08 02:42:17 +10:00
hbristow
3483bf14b9 Added auto-generated docs to all OpenCV functions 2013-08-07 16:34:30 +10:00
hbristow
faeb0aa92a Now using python ArgumentParser to parse command line arguments in preparation for adding doc generation 2013-08-07 01:41:10 +10:00
hbristow
7ef3be3429 By default, all function now export at least one return value back into the Matlab workspace, even if none are requested. This is in line with Matlab's calling convention, where functions called without an lvalue or a semicolon have their first output printed to the terminal 2013-08-07 00:14:13 +10:00
hbristow
b654413567 Added mixed-precision check when attempting to link to an OpenCV version with different bitness. Bindings now compiling and linking on my Windows 7 VM with VS2012 and Matlab R2013a 2013-08-06 13:01:57 +10:00
hbristow
d00f4e267b Added Windows dll versioning and Debug library postfix checks. Dependent libraries now being found by linker :) 2013-08-05 17:37:48 +10:00
hbristow
ecb506842b Added Windows-specific configuration lookup for linker paths 2013-08-05 14:49:12 +10:00
hbristow
dfda79e673 Added passthrough of CXX FLAGS to mex compiler 2013-08-05 00:44:38 +10:00
hbristow
5e50791a9d Generator and compiler now working on Windows. Moved matlab to correct VS solution folder 2013-07-31 12:37:05 +10:00
hbristow
58ca8ed97f Improved finding Matlab on Windows machines. Needs testing on computers that have multiple version installed 2013-07-31 11:24:28 +10:00
hbristow
627b9df85f removed experimental IO from build 2013-07-31 00:00:50 +10:00
hbristow
6549e5e052 Added flaky support for finding Matlab on Windows machines 2013-07-30 23:58:32 +10:00
hbristow
5a34b00737 Added more test cases 2013-07-12 16:57:05 +10:00
hbristow
346f7d0f3e Fast deep-copy-transpose implemented which attempts to not thrash the cache. Good first step for now, but no transpose at all would be preferrable. Started I/O. 2013-07-12 10:38:48 +10:00
hbristow
538dbfe585 Now compiling under much more strigent warnings, with Clang and optional C++11 support 2013-06-29 14:24:53 -07:00
hbristow
fc519aa3b3 Matlab constants now being parsed correctly. Over 700 constants correctly formatted :) 2013-06-27 20:03:38 -07:00
hbristow
ef6327bb89 Now building all OpenCV functions 2013-06-27 18:13:04 -07:00
hbristow
d6453cf051 Now builds all functions except those dependent on Features2d. Improved build detection if cmake is rerun 2013-06-27 16:25:18 -07:00
hbristow
245bc5dcc0 maintenant compiling video et photo aussi 2013-06-27 13:58:40 -07:00
hbristow
bb56ac4ae6 Added delta builds of Matlab executables. Imgproc module now compiling 2013-06-27 00:25:48 -07:00
hbristow
6b88a21be8 added handling of constants equaling constants. e.g. FMT_DEFAULT = FMT_MATLAB 2013-06-26 17:39:08 -07:00
hbristow
8cd48cf35a Added README and proposal. Staging for first public commit 2013-06-23 20:48:40 -07:00
hbristow
c8fdb2c1e0 Changed build locations so that the matlab module can be used in-place, without having to install 2013-06-23 13:54:54 -07:00
hbristow
b0285d92b4 Improved file installation 2013-06-23 13:34:01 -07:00
hbristow
3b77fa5e8c Improved dependency checking 2013-06-23 09:44:26 -07:00
hbristow
24d5adfd54 Added commenting to modules/matlab/CMakeLists.txt 2013-06-22 23:52:05 -07:00
hbristow
755ce9d654 Matlab bindings now only building once rather than every call to make, via the use of some proxies. Matlab build currently only happens in one thread, so it can be pretty slow 2013-06-22 23:26:27 -07:00
hbristow
3b4814a52e Started writing the Bridge interface. Mex wrappers now starting to compile for core 2013-06-22 12:38:40 -07:00
hbristow
1a15ed3279 Started handling trivial case of return references. Removed most modules from build tree while testing (cmake/OpenCVModule) 2013-06-21 17:33:24 -07:00
hbristow
d9cea3b8b0 Compiling matlab from sources now appears as a single target 2013-06-19 17:37:41 +10:00
hbristow
bbece095fb Starting writing Matlab testing framework 2013-06-19 15:04:52 +10:00
hbristow
31415e344f Matlab binding generation now at build time 2013-06-19 13:59:22 +10:00
hbristow
884f36ba65 Improved configure time tests. Added OpenCV specific exception handling 2013-06-19 11:54:14 +10:00
hbristow
804d0924c9 cmake now attempts to generate and compile a simple mex file at configure time and reports the working status of the generator and compiler, rather than just naively saying Matlab exists 2013-06-18 23:00:48 +10:00
hbristow
304fd03e64 Updated jinja version 2013-06-18 17:27:09 +10:00
Hilton Bristow
eda32520e2 Improved tempalte formatting 2013-06-17 16:51:24 +10:00
Hilton Bristow
827b4f93e4 Stripped down jinja, added cmake support 2013-06-17 16:51:24 +10:00
Hilton Bristow
808f9dbc93 Improved parse tree, now building within main opencv build system 2013-06-17 16:51:23 +10:00
Hilton Bristow
ded45b4d1a Added basic ability to find Matlab installations. Added test cpp file under modules/matlab/test to test mex compiler within cmake 2013-06-17 16:48:05 +10:00