From bcc9f20bdad8d21cc34dce190cef607aad21342d Mon Sep 17 00:00:00 2001 From: Kevin Gurney Date: Wed, 22 Nov 2023 10:57:36 -0500 Subject: [PATCH] Move MATLAB information to BuildMatlabArrowInterface.cmake. --- matlab/CMakeLists.txt | 3 --- matlab/tools/cmake/BuildMatlabArrowInterface.cmake | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt index 214adaab19165..ef77246a54921 100644 --- a/matlab/CMakeLists.txt +++ b/matlab/CMakeLists.txt @@ -126,9 +126,6 @@ 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() diff --git a/matlab/tools/cmake/BuildMatlabArrowInterface.cmake b/matlab/tools/cmake/BuildMatlabArrowInterface.cmake index 29b5ef390c251..e41cdf73319cd 100644 --- a/matlab/tools/cmake/BuildMatlabArrowInterface.cmake +++ b/matlab/tools/cmake/BuildMatlabArrowInterface.cmake @@ -19,6 +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 COMPONENTS MAIN_PROGRAM)