Skip to content

Commit b849b71

Browse files
committed
Resolve Windows ODBC test error
`ARROW_TEST_LINK_LIBS` contains more libraries than `ARROW_TEST_STATIC_LINK_LIBS`/`ARROW_TEST_SHARED_LINK_LIBS`, might have been causing linking issues. Add `DEPENDENCIES ` variable back on Windows
1 parent 7f27afc commit b849b71

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ endif()
5959

6060
# On Windows, dynmaic build for ODBC is supported.
6161
# On unix systems, static build for ODBC is supported, all libraries are linked statically on unix.
62+
set(ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES "")
6263
set(ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS "")
6364
set(ARROW_FLIGHT_SQL_ODBC_STATIC_INSTALL_INTERFACE_LIBS "")
6465
set(ARROW_FLIGHT_SQL_ODBC_SHARED_PRIVATE_LINK_LIBS "")
6566
if(WIN32)
67+
set(ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES arrow_flight_sql)
6668
set(ARROW_FLIGHT_SQL_ODBC_SHARED_LINK_LIBS arrow_flight_sql_shared arrow_odbc_spi_impl)
6769
set(ARROW_FLIGHT_SQL_ODBC_STATIC_LINK_LIBS arrow_flight_sql_static)
6870
list(APPEND ARROW_FLIGHT_SQL_ODBC_SHARED_INSTALL_INTERFACE_LIBS
@@ -87,6 +89,8 @@ add_arrow_lib(arrow_flight_sql_odbc
8789
${ARROW_FLIGHT_SQL_ODBC_SRCS}
8890
DEFINITIONS
8991
UNICODE
92+
DEPENDENCIES
93+
${ARROW_FLIGHT_SQL_ODBC_DEPENDENCIES}
9094
SHARED_LINK_FLAGS
9195
${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
9296
SHARED_LINK_LIBS

cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
4444

4545
if(ARROW_TEST_LINKAGE STREQUAL "static")
4646
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_static
47-
${ARROW_TEST_LINK_LIBS})
47+
${ARROW_TEST_STATIC_LINK_LIBS})
4848
else()
4949
set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared
50-
${ARROW_TEST_LINK_LIBS})
50+
${ARROW_TEST_SHARED_LINK_LIBS})
5151
endif()
5252

5353
list(APPEND

0 commit comments

Comments
 (0)