Skip to content

Commit 1c73fa4

Browse files
authored
Merge pull request #13 from jgaa/beta-1
Preparing BETA release
2 parents 9316d39 + c81de86 commit 1c73fa4

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.24)
22

33
if (NOT DEFINED MYSQLPOOL_VERSION)
4-
set(MYSQLPOOL_VERSION 0.0.2)
4+
set(MYSQLPOOL_VERSION 0.2.0)
55
endif()
66

77
project(mysqlpool-cpp
@@ -10,6 +10,8 @@ project(mysqlpool-cpp
1010
VERSION ${MYSQLPOOL_VERSION}
1111
LANGUAGES CXX)
1212

13+
include(GNUInstallDirs)
14+
1315
set(MYSQLPOOL_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
1416
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake)
1517

@@ -148,3 +150,6 @@ add_subdirectory(src)
148150
# We create a configuration file so that other code that include our header files gets the correct configuration.
149151
CONFIGURE_FILE(config.h.template ${CMAKE_BINARY_DIR}/generated-include/mysqlpool/config.h)
150152

153+
install(TARGETS mysqlpool
154+
LIBRARY DESTINATION lib
155+
ARCHIVE DESTINATION lib)

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ The library require C++20 and use C++20 coroutines.
88

99
## Status
1010

11-
Under initial implementation. Not ready for adaption yet.
11+
First BETA release.
12+
13+
Please create an issue if you find any problems or if you have suggestions
14+
on how to make the library more useful.
15+
16+
Friction is a *bug*! If you experience any friction, please create an issue!
17+
18+
PR's with fixes and improvements are most welcome!
1219

1320
## Supported platforms
1421

@@ -73,6 +80,7 @@ need. However, you will have to deal with the error handling yourself.
7380
- Time Zone can be specified for a query. The pool will then ensure that the connection
7481
used for that request use the specified time zone. Useful for servers that handle
7582
requests for users from different time zones.
83+
- Flexible logging options
7684

7785
## Error handling
7886

conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class mysqlpoolRecipe(ConanFile):
66
name = "mysqlpool"
7-
version = "0.0.2"
7+
version = "0.2.0"
88

99
# Optional metadata
1010
license = " BSL-1.0"
@@ -69,10 +69,10 @@ def validate(self):
6969
check_min_cppstd(self, "20")
7070

7171
def requirements(self):
72-
#self.requires("boost/[>=1.84.0]")
72+
self.requires("boost/[>=1.84.0]")
7373
self.requires("zlib/[~1.3]")
7474
self.requires("openssl/[~3]")
75-
self.requires("logfault/[>=0.5.0]")
75+
#self.requires("logfault/[>=0.5.0]") // Waiting for submission to Conan Center to be approved
7676
if not self.conf.get("tools.build:skip_test", default=False):
7777
self.test_requires("gtest/[>=1.14]")
7878

src/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ add_library(${PROJECT_NAME}
1010
${LOGGING_SRC}
1111
)
1212

13-
target_include_directories(${PROJECT_NAME} PRIVATE
13+
target_include_directories(${PROJECT_NAME}
14+
PRIVATE
1415
${CMAKE_INCLUDE_PATH}
1516
${Boost_INCLUDE_DIR}
1617
${LOGFAULT_INCLUDEDIR}
17-
PUBLIC
1818
$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
19-
$<BUILD_INTERFACE:${MYSQLPOOL_ROOT}/include>
20-
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-include>
2119
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/external-projects/installed/include>
2220
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
2321
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
22+
PUBLIC
2423
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
24+
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-include>
25+
$<BUILD_INTERFACE:${MYSQLPOOL_ROOT}/include>
2526
)
2627

2728
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20)

0 commit comments

Comments
 (0)