From 2eef617c7e78d970477295c7e1b3c6a97ce9b415 Mon Sep 17 00:00:00 2001 From: Kevin Gurney Date: Wed, 16 Aug 2023 14:28:39 -0400 Subject: [PATCH 1/2] 1. Remove conditional check for `MATLAB_ARROW_INTERFACE` flag in CMakeLists.txt. 2. Remove mention of `MATLAB_ARROW_INTERFACE` flag from MATLAB `README.md`. --- matlab/CMakeLists.txt | 5 ++--- matlab/README.md | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt index c7be74de8a9..5380e4cbe1b 100644 --- a/matlab/CMakeLists.txt +++ b/matlab/CMakeLists.txt @@ -379,9 +379,8 @@ endif() # Create a subdirectory at CMAKE_INSTALL_PREFIX to install the interface. set(CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/arrow_matlab") -if(MATLAB_ARROW_INTERFACE) - include(BuildMatlabArrowInterface) -endif() +# Build the MATLAB Interface to Arrow. +include(BuildMatlabArrowInterface) # Install MATLAB source files. # On macOS, exclude '.DS_Store' files in the source tree from installation. diff --git a/matlab/README.md b/matlab/README.md index 13b27274d8b..1e8565ece4e 100644 --- a/matlab/README.md +++ b/matlab/README.md @@ -76,12 +76,10 @@ $ cd arrow/matlab To build the MATLAB interface, use [CMake](https://cmake.org/cmake/help/latest/): ```console -$ cmake -S . -B build -D MATLAB_ARROW_INTERFACE=ON +$ cmake -S . -B build $ cmake --build build --config Release ``` -**NOTE:** To build the experimental MATLAB interface code, `-D MATLAB_ARROW_INTERFACE=ON` must be specified as shown above. - ## Install To install the MATLAB interface to the default software installation location for the target machine (e.g. `/usr/local` on Linux or `C:\Program Files` on Windows), pass the `--target install` flag to CMake. @@ -111,7 +109,7 @@ To run the MATLAB tests, start MATLAB in the `arrow/matlab` directory and call t To enable the C++ tests, set the `MATLAB_BUILD_TESTS` flag to `ON` at build time: ```console -$ cmake -S . -B build -D MATLAB_ARROW_INTERFACE=ON -D MATLAB_BUILD_TESTS=ON +$ cmake -S . -B build -D MATLAB_BUILD_TESTS=ON $ cmake --build build --config Release ``` From 32588ed8b168389740edb4b6048e929d8fdb657c Mon Sep 17 00:00:00 2001 From: Kevin Gurney Date: Wed, 16 Aug 2023 14:29:40 -0400 Subject: [PATCH 2/2] Remove `MATLAB_ARROW_INTERFACE` flag from `matlab_build.sh` CI script. --- ci/scripts/matlab_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/scripts/matlab_build.sh b/ci/scripts/matlab_build.sh index 4acd4d3b82a..235002da3af 100755 --- a/ci/scripts/matlab_build.sh +++ b/ci/scripts/matlab_build.sh @@ -29,7 +29,6 @@ cmake \ -S ${source_dir} \ -B ${build_dir} \ -G Ninja \ - -D MATLAB_ARROW_INTERFACE=ON \ -D MATLAB_BUILD_TESTS=ON \ -D CMAKE_INSTALL_PREFIX=${install_dir} \ -D MATLAB_ADD_INSTALL_DIR_TO_SEARCH_PATH=OFF