generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added Windows dll versioning and Debug library postfix checks. Dependent libraries now being found by linker :)

Browse Source
This commit is contained in:
hbristow
2013-08-05 17:37:48 +10:00
parent ecb506842b
commit d00f4e267b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/matlab/CMakeLists.txt
View File

@@ -57,7 +57,6 @@ set(HDR_PARSER_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../python/src2)
# 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))
prepend("-l" MEX_LIBS opencv_core)
set(MEX_OPTS -largeArrayDims) set(MEX_OPTS -largeArrayDims)
if (BUILD_TESTS) if (BUILD_TESTS)
@@ -76,9 +75,8 @@ foreach(opencv_module ${MATLAB_DEPS})
list(APPEND opencv_hdrs "${OPENCV_MODULE_${opencv_module}_LOCATION}/include/opencv2/${module}.hpp") list(APPEND opencv_hdrs "${OPENCV_MODULE_${opencv_module}_LOCATION}/include/opencv2/${module}.hpp")
list(APPEND ${the_module}_ACTUAL_DEPS ${opencv_module}) list(APPEND ${the_module}_ACTUAL_DEPS ${opencv_module})
prepend("-I" MEX_INCLUDE_DIRS "${OPENCV_MODULE_${opencv_module}_LOCATION}/include") prepend("-I" MEX_INCLUDE_DIRS "${OPENCV_MODULE_${opencv_module}_LOCATION}/include")
if (NOT ${module} STREQUAL "core") prepend("-l" MEX_LIBS ${opencv_module}${OPENCV_DLLVERSION})
prepend("-l" MEX_LIBS ${opencv_module}) prepend("-l" MEX_DEBUG_LIBS ${opencv_module}${OPENCV_DLLVERSION}${OPENCV_DEBUG_POSTFIX})
endif()
endif() endif()
endforeach() endforeach()
@@ -174,7 +172,9 @@ add_custom_command(
-DMEX_CXXFLAGS=${MEX_CXXFLAGS} -DMEX_CXXFLAGS=${MEX_CXXFLAGS}
-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)"
-DMEX_LIBS="${MEX_LIBS}" -DMEX_LIBS="${MEX_LIBS}"
-DMEX_DEBUG_LIBS="${MEX_DEBUG_LIBS}"
-P ${CMAKE_CURRENT_SOURCE_DIR}/compile.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/compile.cmake
COMMAND ${CMAKE_COMMAND} -E touch ${COMPILE_PROXY} COMMAND ${CMAKE_COMMAND} -E touch ${COMPILE_PROXY}
COMMENT "Compiling Matlab source files. This could take a while..." COMMENT "Compiling Matlab source files. This could take a while..."

7
modules/matlab/compile.cmake
View File

@@ -3,7 +3,12 @@ macro(listify OUT_LIST IN_STRING)
endmacro() endmacro()
listify(MEX_INCLUDE_DIRS_LIST ${MEX_INCLUDE_DIRS}) listify(MEX_INCLUDE_DIRS_LIST ${MEX_INCLUDE_DIRS})
listify(MEX_LIBS_LIST ${MEX_LIBS}) if (${CONFIGURATION} MATCHES "Debug")
listify(MEX_LIBS_LIST ${MEX_DEBUG_LIBS})
else()
listify(MEX_LIBS_LIST ${MEX_LIBS})
endif()
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/src/*.cpp") file(GLOB SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/src/*.cpp")
foreach(SOURCE_FILE ${SOURCE_FILES}) foreach(SOURCE_FILE ${SOURCE_FILES})
# strip out the filename # strip out the filename