Skip to content

Commit 218746f

Browse files
alinaliBQvic-tsang
andcommitted
Move path for Windows install files
Co-Authored-By: vic-tsang <[email protected]>
1 parent 6c8c099 commit 218746f

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if(WIN32)
5757
set(VER_COMPANYNAME_STR ${ODBC_PACKAGE_VENDOR})
5858
set(VER_PRODUCTNAME_STR ${ODBC_PACKAGE_NAME})
5959

60-
configure_file("install/versioninfo.rc.in" "install/versioninfo.rc" @ONLY)
60+
configure_file("install/windows/versioninfo.rc.in" "install/versioninfo.rc" @ONLY)
6161

6262
list(APPEND ARROW_FLIGHT_SQL_ODBC_SRCS odbc.def install/versioninfo.rc)
6363
endif()
@@ -135,11 +135,12 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
135135
PATTERN "zlib1.dll")
136136

137137
set(CPACK_WIX_EXTRA_SOURCES
138-
"${CMAKE_CURRENT_SOURCE_DIR}/install/arrow-flight-sql-odbc.wxs")
138+
"${CMAKE_CURRENT_SOURCE_DIR}/install/windows/arrow-flight-sql-odbc.wxs")
139139
set(CPACK_WIX_PATCH_FILE
140-
"${CMAKE_CURRENT_SOURCE_DIR}/install/arrow-flight-sql-odbc-patch.xml")
140+
"${CMAKE_CURRENT_SOURCE_DIR}/install/windows/arrow-flight-sql-odbc-patch.xml")
141141

142-
set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/install/arrow-wix-banner.bmp")
142+
set(CPACK_WIX_UI_BANNER
143+
"${CMAKE_CURRENT_SOURCE_DIR}/install/windows/arrow-wix-banner.bmp")
143144
endif()
144145

145146
get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)

cpp/src/arrow/flight/sql/odbc/install/arrow-flight-sql-odbc-patch.xml renamed to cpp/src/arrow/flight/sql/odbc/install/windows/arrow-flight-sql-odbc-patch.xml

File renamed without changes.

cpp/src/arrow/flight/sql/odbc/install/arrow-flight-sql-odbc.wxs renamed to cpp/src/arrow/flight/sql/odbc/install/windows/arrow-flight-sql-odbc.wxs

File renamed without changes.

cpp/src/arrow/flight/sql/odbc/install/arrow-wix-banner.bmp renamed to cpp/src/arrow/flight/sql/odbc/install/windows/arrow-wix-banner.bmp

File renamed without changes.

cpp/src/arrow/flight/sql/odbc/install/versioninfo.rc.in renamed to cpp/src/arrow/flight/sql/odbc/install/windows/versioninfo.rc.in

File renamed without changes.

0 commit comments

Comments
 (0)