projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa075c5
)
Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}...
author
Rok Mandeljc
<rok.mandeljc@gmail.com>
Mon, 28 Apr 2014 11:42:27 +0000
(13:42 +0200)
committer
Rok Mandeljc
<rok.mandeljc@gmail.com>
Sat, 3 May 2014 15:37:48 +0000
(17:37 +0200)
modules/matlab/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/modules/matlab/CMakeLists.txt
b/modules/matlab/CMakeLists.txt
index
3a5c6d1
..
a4c1c3b
100644
(file)
--- a/
modules/matlab/CMakeLists.txt
+++ b/
modules/matlab/CMakeLists.txt
@@
-104,7
+104,11
@@
set(RST_PARSER_PATH ${CMAKE_SOURCE_DIR}/modules/java/generator)
# set mex compiler options
prepend("-I" MEX_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-prepend("-L" MEX_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR} )
+if (MSVC)
+ prepend("-L" MEX_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
+else()
+ prepend("-L" MEX_LIB_DIR ${LIBRARY_OUTPUT_PATH})
+endif()
set(MEX_OPTS "-largeArrayDims")
if (BUILD_TESTS)