mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-05 09:49:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1681 from LeszekSwirski:fix-ninjabuild

Browse Source
This commit is contained in:
Roman Donchenko 2013-10-25 13:30:52 +04:00 committed by OpenCV Buildbot
commit 31f0ab6c80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/matlab/CMakeLists.txt
View File

@ -104,7 +104,7 @@ set(RST_PARSER_PATH ${CMAKE_SOURCE_DIR}/modules/java/generator)
# set mex compiler options # set mex compiler options
prepend("-I" MEX_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) prepend("-I" MEX_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
prepend("-L" MEX_LIB_DIR ${LIBRARY_OUTPUT_PATH}/$(Configuration)) prepend("-L" MEX_LIB_DIR ${LIBRARY_OUTPUT_PATH}/$<CONFIGURATION>)
set(MEX_OPTS "-largeArrayDims") set(MEX_OPTS "-largeArrayDims")
if (BUILD_TESTS) if (BUILD_TESTS)
@ -229,7 +229,7 @@ add_custom_command(
--opencv_version ${OPENCV_VERSION} --opencv_version ${OPENCV_VERSION}
--commit ${GIT_COMMIT} --commit ${GIT_COMMIT}
--modules ${opencv_modules} --modules ${opencv_modules}
--configuration "$(Configuration)" ${CMAKE_BUILD_TYPE} --configuration $<CONFIGURATION>
--outdir ${CMAKE_CURRENT_BINARY_DIR} --outdir ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/generator/cvmex.py ${CMAKE_CURRENT_SOURCE_DIR}/generator/cvmex.py
@ -257,7 +257,7 @@ add_custom_command(
-DMEX_CXXFLAGS=${MEX_CXX_FLAGS} -DMEX_CXXFLAGS=${MEX_CXX_FLAGS}
-DMEX_INCLUDE_DIRS="${MEX_INCLUDE_DIRS}" -DMEX_INCLUDE_DIRS="${MEX_INCLUDE_DIRS}"
-DMEX_LIB_DIR=${MEX_LIB_DIR} -DMEX_LIB_DIR=${MEX_LIB_DIR}
-DCONFIGURATION="$(Configuration)" -DCONFIGURATION="$<CONFIGURATION>"
-DMEX_LIBS="${MEX_LIBS}" -DMEX_LIBS="${MEX_LIBS}"
-DMEX_DEBUG_LIBS="${MEX_DEBUG_LIBS}" -DMEX_DEBUG_LIBS="${MEX_DEBUG_LIBS}"
-P ${CMAKE_CURRENT_SOURCE_DIR}/compile.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/compile.cmake