Skip to content

Commit 94c4d89

Browse files
committed
Remove find_package call.
1 parent 86b5e24 commit 94c4d89

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

matlab/CMakeLists.txt

+3-6
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,14 @@ else()
126126
set(MATLAB_BUILD_OUTPUT_DIR "${CMAKE_BINARY_DIR}")
127127
endif()
128128

129+
set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
130+
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")
131+
129132
find_package(Arrow QUIET)
130133
if(NOT Arrow_FOUND)
131134
build_arrow()
132135
endif()
133136

134-
# MATLAB is Required
135-
find_package(Matlab REQUIRED COMPONENTS MAIN_PROGRAM)
136-
137-
message(STATUS "Mex Library: ${Matlab_MEX_LIBRARY}")
138-
message(STATUS "Mex Include Folder: ${Matlab_INCLUDE_DIRS}")
139-
140137
# ARROW_SHARED_LIB
141138
# 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.
142139
if(NOT Arrow_FOUND)

matlab/tools/cmake/BuildMatlabArrowInterface.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
# Configure libmexclass FetchContent
2020
# ----------------------------------
2121

22-
set(MATLAB_ADDITIONAL_VERSIONS "R2023b=23.2")
23-
set(Matlab_ROOT_DIR "C:/Program Files/MATLAB/R2023b")
24-
2522
set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_NAME libmexclass)
2623
# TODO: Consider using SSH URL for the Git Repository when
2724
# libmexclass is accessible for CI without permission issues.

0 commit comments

Comments
 (0)