Skip to content

Commit 8fdc51a

Browse files
committed
Fix MEX file compilation with OpenMP
1 parent 3a6b932 commit 8fdc51a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/matlab/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@ if(MEX_CMD AND MEXEXT_CMD)
3030
EXECUTE_PROCESS(COMMAND ${MEXEXT_REAL_CMD} OUTPUT_VARIABLE MEX_EXTENSION OUTPUT_STRIP_TRAILING_WHITESPACE)
3131
SET(MEX_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MEX_NAME}.${MEX_EXTENSION})
3232

33+
if (WIN32)
34+
set(MEX_BUILD_FLAGS "COMPFLAGS='$$COMPFLAGS ${OpenMP_CXX_FLAGS}' LINKFLAGS='$$LINKFLAGS ${OpenMP_CXX_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}'")
35+
else()
36+
set(MEX_BUILD_FLAGS "CFLAGS='$$CFLAGS ${OpenMP_CXX_FLAGS}' LDFLAGS='$$LDFLAGS ${OpenMP_CXX_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}'")
37+
endif()
38+
separate_arguments(MEX_BUILD_FLAGS)
39+
3340
ADD_CUSTOM_COMMAND(
3441
OUTPUT ${MEX_FILE}
3542
COMMAND ${MEX_REAL_CMD}
36-
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${LIBRARY_OUTPUT_PATH} -lflann_s
43+
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${LIBRARY_OUTPUT_PATH} -lflann_s ${MEX_BUILD_FLAGS}
3744
DEPENDS flann_s ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp
3845
COMMENT "Building MEX extension ${MEX_FILE}"
3946
)

0 commit comments

Comments
 (0)