Skip to content

Commit ef3e33b

Browse files
committed
Work on David's comments
- Use `target_include_directories`
1 parent 581bfcc commit ef3e33b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
add_custom_target(tests)
19-
20-
if(WIN32)
21-
include_directories(${ODBC_INCLUDE_DIRS})
22-
else()
23-
include_directories(${ODBC_INCLUDE_DIR})
24-
endif()
25-
2618
find_package(SQLite3Alt REQUIRED)
2719

2820
set(ARROW_FLIGHT_SQL_MOCK_SERVER_SRCS
@@ -55,5 +47,13 @@ add_arrow_test(flight_sql_odbc_test
5547
${SQLite3_LIBRARIES}
5648
arrow_odbc_spi_impl)
5749

50+
# On Windows, cmake uses suffix `DIRS` for ODBC include headers, and
51+
# on unix, cmake uses suffix `DIR`.
52+
if(WIN32)
53+
target_include_directories(arrow-flight-sql-odbc-test PUBLIC ${ODBC_INCLUDE_DIRS})
54+
else()
55+
target_include_directories(arrow-flight-sql-odbc-test PUBLIC ${ODBC_INCLUDE_DIR})
56+
endif()
57+
5858
# Disable unity build due to sqlite_sql_info.cc conflict with sql.h and sqlext.h headers.
5959
set_target_properties(arrow-flight-sql-odbc-test PROPERTIES UNITY_BUILD OFF)

0 commit comments

Comments
 (0)