Skip to content

Commit

Permalink
Preparing BETA release
Browse files Browse the repository at this point in the history
  • Loading branch information
jgaa committed Mar 24, 2024
1 parent 9316d39 commit c81de86
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)

if (NOT DEFINED MYSQLPOOL_VERSION)
set(MYSQLPOOL_VERSION 0.0.2)
set(MYSQLPOOL_VERSION 0.2.0)
endif()

project(mysqlpool-cpp
Expand All @@ -10,6 +10,8 @@ project(mysqlpool-cpp
VERSION ${MYSQLPOOL_VERSION}
LANGUAGES CXX)

include(GNUInstallDirs)

set(MYSQLPOOL_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake)

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

install(TARGETS mysqlpool
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ The library require C++20 and use C++20 coroutines.

## Status

Under initial implementation. Not ready for adaption yet.
First BETA release.

Please create an issue if you find any problems or if you have suggestions
on how to make the library more useful.

Friction is a *bug*! If you experience any friction, please create an issue!

PR's with fixes and improvements are most welcome!

## Supported platforms

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

## Error handling

Expand Down
6 changes: 3 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class mysqlpoolRecipe(ConanFile):
name = "mysqlpool"
version = "0.0.2"
version = "0.2.0"

# Optional metadata
license = " BSL-1.0"
Expand Down Expand Up @@ -69,10 +69,10 @@ def validate(self):
check_min_cppstd(self, "20")

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

Expand Down
9 changes: 5 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@ add_library(${PROJECT_NAME}
${LOGGING_SRC}
)

target_include_directories(${PROJECT_NAME} PRIVATE
target_include_directories(${PROJECT_NAME}
PRIVATE
${CMAKE_INCLUDE_PATH}
${Boost_INCLUDE_DIR}
${LOGFAULT_INCLUDEDIR}
PUBLIC
$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
$<BUILD_INTERFACE:${MYSQLPOOL_ROOT}/include>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-include>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/external-projects/installed/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-include>
$<BUILD_INTERFACE:${MYSQLPOOL_ROOT}/include>
)

set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20)
Expand Down

0 comments on commit c81de86

Please sign in to comment.