Skip to content

Commit 92879f2

Browse files
committed
Fixed product name for msi build
1 parent fc9bb57 commit 92879f2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
# This is the LGPL libmariadb project.
5-
PROJECT(mariadb-client C)
5+
PROJECT(mariadb-connector-c C)
66

77
SET(CPACK_PACKAGE_VERSION_MAJOR 2)
88
SET(CPACK_PACKAGE_VERSION_MINOR 1)

win/packaging/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SET(CLIENT_LIB_DIR ${CMAKE_BINARY_DIR}/libmariadb/${CMAKE_BUILD_TYPE})
22
SET(CLIENT_DBG_DIR ${CMAKE_BINARY_DIR}/libmariadb/Debug)
33
SET(CLIENT_INC_DIR ${CMAKE_SOURCE_DIR}/include)
44

5-
SET(PRODUCT_NAME "MariaDB Connectorr/C")
5+
SET(PRODUCT_NAME "MariaDB Connector C")
66
SET(PRODUCT_INSTALL_DIR "MariaDB")
77
SET(PRODUCT_MANUFACTURER "MariaDB Corporation")
88
SET(PRODUCT_VERSION "${CPACK_PACKAGE_VERSION}")

win/packaging/mariadb-connector-c.xml.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<Fragment>
3030
<Directory Id="TARGETDIR" Name="SourceDir">
3131
<Directory Id="@FOLDER@">
32-
<Directory Id="Mariadb" Name="@PRODUCT_NAME@">
33-
<Directory Id="INSTALLFOLDER" Name="@PRODUCT_INSTALL_DIR@" >
32+
<Directory Id="Mariadb" Name="@PRODUCT_INSTALL_DIR@">
33+
<Directory Id="INSTALLFOLDER" Name="@PRODUCT_NAME@" >
3434
<Directory Id="instlib" Name="lib">
3535
<Directory Id="instlib_debug" Name="debug"/>
3636
</Directory>

0 commit comments

Comments
 (0)