From 9f995bdcfcee78b44e012734f6bd50e54d2b77d7 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 16 Feb 2022 20:47:09 +0300 Subject: [PATCH] Fix build of matlab/octave with recent cmake Signed-off-by: Alexander Golubev --- src/matlab/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt index 1f7c989..4213a06 100755 --- a/src/matlab/CMakeLists.txt +++ b/src/matlab/CMakeLists.txt @@ -16,9 +16,6 @@ endif() find_program(OCT_CMD mkoctfile) -get_property(FLANN_LIB_LOCATION TARGET flann_s PROPERTY LOCATION) -get_filename_component(FLANN_LIB_PATH ${FLANN_LIB_LOCATION} PATH) - if(MEX_CMD AND MEXEXT_CMD) get_filename_component(MEX_REAL_CMD ${MEX_CMD} ABSOLUTE) @@ -48,7 +45,7 @@ if(MEX_CMD AND MEXEXT_CMD) ADD_CUSTOM_COMMAND( OUTPUT ${MEX_FILE} COMMAND ${MEX_REAL_CMD} - ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${FLANN_LIB_PATH} -lflann_s ${MEX_BUILD_FLAGS} + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${PROJECT_BINARY_DIR}/lib -lflann_s ${MEX_BUILD_FLAGS} DEPENDS flann_s ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp COMMENT "Building MEX extension ${MEX_FILE}" ) @@ -71,7 +68,7 @@ elseif(OCT_CMD) ADD_CUSTOM_COMMAND( OUTPUT ${MEX_FILE} COMMAND ${OCT_CMD} - ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${FLANN_LIB_PATH} -DFLANN_STATIC -lflann_s -lgomp + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${PROJECT_BINARY_DIR}/lib -DFLANN_STATIC -lflann_s -lgomp DEPENDS flann_s ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp COMMENT "Building MEX extension ${MEX_FILE}" ) -- 2.34.1