From c1e8857f3fa39001d709f8948b4d3b558cf153dd Mon Sep 17 00:00:00 2001
From: shegden <shegden@mathworks.com>
Date: Fri, 20 Jan 2023 16:52:54 -0500
Subject: [PATCH] Fix build error on Windows with the libmexclass integration.
 Also, update the register proxy macro name to reflect libmexclass changes for
 Issue #20.

---
 matlab/CMakeLists.txt                                | 12 ++++++++++--
 .../src/cpp/arrow/matlab/proxy/CustomProxyFactory.cc |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index e2bd66883450a..2930eeb0be0f7 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -318,7 +318,15 @@ matlab_add_mex(R2018a
 target_include_directories(mexcall PRIVATE ${CPP_SOURCE_DIR})
 
 ############# libmexclass #################################
-get_target_property(ARROW_SHARED_LIB arrow_shared IMPORTED_LOCATION)
+# On Windows, we use the arrow.lib for linking arrow_matlab against the Arrow C++ library.
+# The location of arrow.lib is previously saved in IMPORTED_IMPLIB.
+if(WIN32)
+	get_target_property(ARROW_LINK_LIB arrow_shared IMPORTED_IMPLIB)
+else()
+	# On Linux and macOS, it is the arrow.dll in the newly built arrow_shared library used for linking.
+	# This is available in IMPORTED_LOCATION.
+	get_target_property(ARROW_LINK_LIB arrow_shared IMPORTED_LOCATION)
+endif()
 get_target_property(ARROW_INCLUDE_DIR arrow_shared INTERFACE_INCLUDE_DIRECTORIES)
 
 set(CUSTOM_PROXY_FACTORY_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/proxy;${CMAKE_SOURCE_DIR}/src/cpp")
@@ -326,7 +334,7 @@ set(CUSTOM_PROXY_FACTORY_SOURCES "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/proxy
 set(CUSTOM_PROXY_SOURCES_DIR "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/proxy")
 set(CUSTOM_PROXY_SOURCES "${CUSTOM_PROXY_SOURCES_DIR}/array/double_array_proxy.cc")
 set(CUSTOM_PROXY_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src/cpp;${ARROW_INCLUDE_DIR}")
-set(CUSTOM_PROXY_LINK_LIBRARIES ${ARROW_SHARED_LIB})
+set(CUSTOM_PROXY_LINK_LIBRARIES ${ARROW_LINK_LIB})
 
 # Build libmexclass as an external project.
 include(ExternalProject)
diff --git a/matlab/src/cpp/arrow/matlab/proxy/CustomProxyFactory.cc b/matlab/src/cpp/arrow/matlab/proxy/CustomProxyFactory.cc
index 96711a264d4f7..72d8a028d687d 100644
--- a/matlab/src/cpp/arrow/matlab/proxy/CustomProxyFactory.cc
+++ b/matlab/src/cpp/arrow/matlab/proxy/CustomProxyFactory.cc
@@ -20,6 +20,6 @@
 #include "CustomProxyFactory.h"
 
 std::shared_ptr<Proxy> CustomProxyFactory::make_proxy(const ClassName& class_name, const FunctionArguments& constructor_arguments) {
-    registerProxy(DoubleArrayProxy);
+    REGISTER_PROXY_SAME_NAME(DoubleArrayProxy);
     return nullptr;
 };