Skip to content

Commit

Permalink
Move MATLAB information.
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingurney committed Nov 22, 2023
1 parent 795c4ac commit 2df9b4f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 6 additions & 0 deletions matlab/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ if(NOT Arrow_FOUND)
build_arrow()
endif()

set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")
message(STATUS "MATLAB_ADDITIONAL_VERSOINS = ${MATLAB_ADDITIONAL_VERSIONS}")
message(STATUS "Matlab_ROOT_DIR = ${Matlab_ROOT_DIR}")
find_package(Matlab REQUIRED)

# 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,11 +19,8 @@
# Configure libmexclass FetchContent
# ----------------------------------

set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")
message(STATUS "MATLAB_ADDITIONAL_VERSOINS = ${MATLAB_ADDITIONAL_VERSIONS}")
message(STATUS "Matlab_ROOT_DIR = ${Matlab_ROOT_DIR}")
find_package(Matlab REQUIRED)

set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_NAME libmexclass)
# TODO: Consider using SSH URL for the Git Repository when
Expand Down

0 comments on commit 2df9b4f

Please sign in to comment.