Skip to content

Commit

Permalink
Remove find_package call.
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingurney committed Nov 22, 2023
1 parent 86b5e24 commit 94c4d89
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
9 changes: 3 additions & 6 deletions matlab/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,14 @@ else()
set(MATLAB_BUILD_OUTPUT_DIR "${CMAKE_BINARY_DIR}")
endif()

set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")

find_package(Arrow QUIET)
if(NOT Arrow_FOUND)
build_arrow()
endif()

# MATLAB is Required
find_package(Matlab REQUIRED COMPONENTS MAIN_PROGRAM)

message(STATUS "Mex Library: ${Matlab_MEX_LIBRARY}")
message(STATUS "Mex Include Folder: ${Matlab_INCLUDE_DIRS}")

# ARROW_SHARED_LIB
# On Windows, this will be ARROW_HOME/bin/arrow.dll and on Linux and macOS, it is the arrow.so/dylib in the newly built arrow_shared library.
if(NOT Arrow_FOUND)
Expand Down
3 changes: 0 additions & 3 deletions matlab/tools/cmake/BuildMatlabArrowInterface.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
# Configure libmexclass FetchContent
# ----------------------------------

set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")

set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_NAME libmexclass)
# TODO: Consider using SSH URL for the Git Repository when
# libmexclass is accessible for CI without permission issues.
Expand Down

0 comments on commit 94c4d89

Please sign in to comment.