VladPolskiy/mariadb-connector-cpp
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-cpp.git synced 2025-07-31 21:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed deb/rpm files nameing to mariadb-connector-cpp-xxx...

Browse Source 
from mariadbcpp-xxx... to align with tarballs naming pattern.
Fixed one ommitted thing from mingw patch.
This commit is contained in:
Lawrin Novitsky
2024-01-02 13:13:18 +01:00
parent 8641b1453a
commit 748d9bb1cf
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/packaging.cmake
View File

@ -1,5 +1,5 @@
INCLUDE(cmake/ConnectorName.cmake)
SET(CPACK_PACKAGE_NAME "${LIBRARY_NAME}")
SET(CPACK_PACKAGE_NAME "mariadb-connector-cpp")
SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
IF(NOT CPACK_PACKAGE_RELEASE)
SET(CPACK_PACKAGE_RELEASE 1)
@ -29,7 +29,7 @@ IF (MACPP_VERSION_QUALITY AND NOT "${MACPP_VERSION_QUALITY}" STREQUAL "ga" AND N
ENDIF()
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-connector-cpp-${CPACK_PACKAGE_VERSION}${QUALITY_SUFFIX}-src")
GET_CONNECTOR_PACKAGE_NAME(CPACK_PACKAGE_FILE_NAME "mariadb-connector-cpp")
GET_CONNECTOR_PACKAGE_NAME(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
SET(CPACK_SOURCE_IGNORE_FILES
/test/

16
test/test_common.cpp
View File

@ -37,9 +37,7 @@
#include <iostream>
#include <sstream>
#include <string>
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <inttypes.h>
#elif not defined(_WIN32)
#if defined(__MINGW32__) || defined(__MINGW64__) || !defined(_WIN32)
#include <inttypes.h>
#endif
@ -100,23 +98,11 @@ static int silent = 1;
#include <stdio.h>
#ifndef L64
#if defined(__MINGW32__) || defined(__MINGW64__)
#define L64(x) x##LL
#elif not defined(_WIN32)
#define L64(x) x##LL
#else
#define L64(x) x##i64
#endif
#endif
#ifndef UL64
#if defined(__MINGW32__) || defined(__MINGW64__)
#define UL64(x) x##ULL
#elif not defined(_WIN32)
#define UL64(x) x##ULL
#else
#define UL64(x) x##ui64
#endif
#endif
#define SSPS_USED() ((loops % 2) != 0)