Skip to content

Commit 436ab76

Browse files
committed
Fixed package name for windows
1 parent c723ed1 commit 436ab76

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ STRING(TOLOWER ${CMAKE_SYSTEM_NAME} system_name)
214214
SET(CPACK_PACKAGE_FILE_NAME "mariadb-connector-c-${CPACK_PACKAGE_VERSION}-${system_name}-${CMAKE_SYSTEM_PROCESSOR}")
215215
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LIB")
216216
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
217-
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-src")
217+
INCLUDE(cmake/ConnectorName.cmake)
218+
SET(CPACK_SOURCE_PACKAGE_FILE_NAME GET_CONNECTOR_PACKAGE_NAME())
218219

219220
SET(CPACK_SOURCE_IGNORE_FILES
220221
.bzr/

cmake/ConnectorName.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
MACRO(GET_CONNECTOR_PACKAGE_NAME name)
2+
# check if we have 64bit
3+
IF(SIZEOF_VOIDP EQUAL 8)
4+
SET(IS64 1)
5+
ENDIF()
6+
7+
SET (PLAFORM_NAME CMAKE_SYSTEM_NAME)
8+
SET (MACHINE_NAME CMAKE_SYSTEM_PROCESSOR)
9+
SET (CONCAT_SIGN "-")
10+
11+
IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
12+
SET(PLATFORM_NAME "win")
13+
SET(CONCAT_SIGN "")
14+
IF(IS64)
15+
SET(MACHINE_NAME "x64")
16+
ELSE()
17+
SET(MACHINE_NAME "32")
18+
END()
19+
ENDIF()
20+
21+
SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
22+
STRING(TOLOWER ${product_name} ${name})
23+
ENDMACRO()

0 commit comments

Comments
 (0)