Commit 6fd296c0 authored by hbristow's avatar hbristow

More aggressive build warnings. The cmake configuration is quite fragile. Pay…

More aggressive build warnings. The cmake configuration is quite fragile. Pay particular attention to quotes around variables
parent 538dbfe5
...@@ -3,14 +3,15 @@ macro(listify OUT_LIST IN_STRING) ...@@ -3,14 +3,15 @@ macro(listify OUT_LIST IN_STRING)
endmacro() endmacro()
listify(MEX_INCLUDE_DIRS_LIST ${MEX_INCLUDE_DIRS}) listify(MEX_INCLUDE_DIRS_LIST ${MEX_INCLUDE_DIRS})
set(MEX_CXXFLAGS "CXXFLAGS=\$CXXFLAGS -pedantic -Wall -Wextra -Weffc++ -Wno-unused -Wold-style-cast -Wshadow -Wmissing-declarations -Wmissing-include-dirs -Wnon-virtual-dtor")
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
get_filename_component(FILENAME ${SOURCE_FILE} NAME_WE) get_filename_component(FILENAME ${SOURCE_FILE} NAME_WE)
# compile the source file using mex # compie the source file using mex
if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/+cv/${FILENAME}.${MATLAB_MEXEXT}) if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/+cv/${FILENAME}.${MATLAB_MEXEXT})
execute_process( execute_process(
COMMAND ${MATLAB_MEX_SCRIPT} ${MEX_OPTS} ${MEX_INCLUDE_DIRS_LIST} COMMAND ${MATLAB_MEX_SCRIPT} "${MEX_CXXFLAGS}" ${MEX_INCLUDE_DIRS_LIST}
${MEX_LIB_DIR} ${MEX_LIBS} ${SOURCE_FILE} ${MEX_LIB_DIR} ${MEX_LIBS} ${SOURCE_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/+cv WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/+cv
ERROR_VARIABLE FAILED ERROR_VARIABLE FAILED
......
...@@ -282,7 +282,7 @@ public: ...@@ -282,7 +282,7 @@ public:
template <typename Scalar> template <typename Scalar>
explicit MxArray(size_t m, size_t n, size_t k=1) : owns_(true) { explicit MxArray(size_t m, size_t n, size_t k=1) : owns_(true) {
mwSize dims[] = {m, n, k}; mwSize dims[] = { static_cast<mwSize>(m), static_cast<mwSize>(n), static_cast<mwSize>(k) };
ptr_ = mxCreateNumericArray(3, dims, Matlab::Traits<Scalar>::ScalarType, Matlab::Traits<>::Real); ptr_ = mxCreateNumericArray(3, dims, Matlab::Traits<Scalar>::ScalarType, Matlab::Traits<>::Real);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment