database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-04-18 21:24:07 +03:00
Code

Windows installation fix:

Browse Source 
MSI package didn't install include/mariadb.
This commit is contained in:
Georg Richter 2023-09-27 10:19:23 +02:00
parent 5d51d160d8
commit b323b5462d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mariadb_rpl.h
View File

@ -22,7 +22,7 @@ extern "C" {
#endif
#include <stdint.h>
#include <ma_io.h>
#include <mariadb/ma_io.h>
#define MARIADB_RPL_VERSION 0x0002
#define MARIADB_RPL_REQUIRED_VERSION 0x0002

2
win/packaging/CMakeLists.txt
View File

@ -56,6 +56,8 @@ FOREACH(src ${WIX_INCLUDES})
STRING(REPLACE "mariadb/" "" src_id ${src_id})
IF(${src} MATCHES "mysql/")
SET(MARIADB_INCLUDEMYSQL_FILES "${MARIADB_INCLUDEMYSQL_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${SRC_DIR}/include/${src}\"/>\n")
ELSEIF (${src} MATCHES "mariadb/")
SET(MARIADB_INCLUDEMARIADB_FILES "${MARIADB_INCLUDEMARIADB_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${SRC_DIR}/include/${src}\"/>\n")
ELSE()
SET(MARIADB_INCLUDE_FILES "${MARIADB_INCLUDE_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${SRC_DIR}/include/${src}\"/>\n")
ENDIF()

6
win/packaging/mariadb-connector-c.xml.in
View File

@ -22,6 +22,7 @@
<Feature Id="IncludeFeature" Title="Include Files" Level="1">
<ComponentRef Id="Includes"/>
<ComponentRef Id="MysqlIncludes"/>
<ComponentRef Id="MariadbIncludes"/>
</Feature>
</Product>
@ -37,6 +38,7 @@
</Directory>
<Directory Id="instinclude" Name="include" >
<Directory Id="instincludemysql" Name="mysql"/>
<Directory Id="instincludemariadb" Name="mariadb"/>
</Directory>
</Directory>
</Directory>
@ -74,6 +76,10 @@
<CreateFolder/>
@MARIADB_INCLUDEMYSQL_FILES@
</Component>
<Component Id="MariadbIncludes" Guid="DEFD4D6B-0143-442A-BEB8-C041F7156BF1" Directory="instincludemariadb" DiskId="1" Win64="@IS_WIN64@">
<CreateFolder/>
@MARIADB_INCLUDEMARIADB_FILES@
</Component>
</Fragment>
</Wix>