Compare commits

...

2 Commits

Author SHA1 Message Date
an-tao
93c568bb95 Bump version to 1.9.2 2024-01-18 21:46:10 +08:00
MWX
af29e25b03
Fix name issue when cross-compiling (#1906) 2024-01-18 13:38:27 +08:00
6 changed files with 60 additions and 8 deletions

View File

@ -24,7 +24,7 @@ CMAKE_DEPENDENT_OPTION(USE_SPDLOG "Allow using the spdlog logging library" OFF "
set(DROGON_MAJOR_VERSION 1)
set(DROGON_MINOR_VERSION 9)
set(DROGON_PATCH_VERSION 1)
set(DROGON_PATCH_VERSION 2)
set(DROGON_VERSION
${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
set(DROGON_VERSION_STRING "${DROGON_VERSION}")
@ -66,7 +66,7 @@ if (BUILD_SHARED_LIBS)
SOVERSION ${DROGON_MAJOR_VERSION})
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
if (WIN32)
target_link_libraries(${PROJECT_NAME} PUBLIC Rpcrt4 ws2_32 crypt32 Advapi32)
target_link_libraries(${PROJECT_NAME} PUBLIC rpcrt4 crypt32 advapi32 ws2_32)
if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
# Ignore MSVC C4251 and C4275 warning of exporting std objects with no dll export
# We export class to facilitate maintenance, thus if you compile
@ -141,7 +141,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
elseif (NOT WIN32 AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
target_link_libraries(${PROJECT_NAME} PRIVATE dl)
elseif (WIN32)
target_link_libraries(${PROJECT_NAME} PRIVATE shlwapi)
target_link_libraries(${PROJECT_NAME} PRIVATE shlwapi ws2_32 iphlpapi)
endif ()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/)

View File

@ -4,6 +4,56 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
## [1.9.2] - 2024-01-18
### API changes list
- Feature: Integrate spdlog as logging backend.
- Support asynchronous sending of chunked responses.
### Changed
- Modify the configuration file templates in drogon_ctl.
- Use execute_process instead of exec_program in FindJsoncpp.cmake.
- GitHub Action to find typos in the codebase using codespell.
- add discord link to readme.
- Add -k option to the drogon_ctl when running the press command.
- Refine request routing process.
- Add CI tests with more compilers.
- Avoid a race condition in database listener tests.
- Remove macos-11 CI; not supported by Homebrew.
- Bump github/codeql-action from 2 to 3.
- Move the RealIpResolver plugin to the PreRouting join point.
### Fixed
- Fix: typo on Mapper method.
- Fix a error of coroutines on Windows.
- Fix ORM: The original way did not handle exceptions correctly.
- Remove the default ctor of the Row class in ORM.
- Set the url of trantor to the official repository.
- Fix htonll/ntohll redefinition.
- Fix building with MSYS2.
- Fix name issue when cross-compiling.
## [1.9.1] - 2023-11-27
### API changes list
@ -1525,7 +1575,9 @@ All notable changes to this project will be documented in this file.
## [1.0.0-beta1] - 2019-06-11
[Unreleased]: https://github.com/an-tao/drogon/compare/v1.9.1...HEAD
[Unreleased]: https://github.com/an-tao/drogon/compare/v1.9.2...HEAD
[1.9.2]: https://github.com/an-tao/drogon/compare/v1.9.1...v1.9.2
[1.9.1]: https://github.com/an-tao/drogon/compare/v1.9.0...v1.9.1

View File

@ -57,7 +57,7 @@ target_link_libraries(drogon_ctl PRIVATE ${PROJECT_NAME})
target_include_directories(drogon_ctl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
add_dependencies(drogon_ctl _drogon_ctl)
if(WIN32)
target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4 iphlpapi)
target_link_libraries(drogon_ctl PRIVATE ws2_32 rpcrt4 iphlpapi)
endif(WIN32)
if(APPLE)
target_link_libraries(drogon_ctl PRIVATE resolv)

View File

@ -48,7 +48,7 @@ set(example_targets
# Add warnings for our example targets--some warnings (such as -Wunused-parameter) only appear
# when the templated functions are instantiated at their point of use.
if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
if(NOT ${CMAKE_PLATFORM_NAME} STREQUAL "Windows" AND CMAKE_CXX_COMPILER_ID MATCHES GNU)
foreach(target ${example_targets})
target_compile_options(${target} PRIVATE -Wall -Wextra -Werror)
endforeach()

View File

@ -21,7 +21,7 @@
#include <brotli/encode.h>
#endif
#ifdef _WIN32
#include <Rpc.h>
#include <rpc.h>
#include <direct.h>
#include <io.h>
#include <iomanip>

@ -1 +1 @@
Subproject commit 2c25a746f31cb211641c9c5bccc132251529d2f5
Subproject commit b21daa768b22d527a551e6fc5558b8f9845f8edd