Skip to content

Commit 1765223

Browse files
authored
Fix CMAKE issues mentioned in #2144 and a linking problem which manifest with gcc12.3 when building with shared libs (#2208) (#2213)
* Respect find_package QUIET * Add policy_max to cmake_minimum_required Avoid deprecation warning introduced by cmake 3.31 * Add missing DROGON_EXPORT
1 parent 71b6d57 commit 1765223

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.5...3.31)
22

33
project(drogon)
44

cmake/ParseAndAddDrogonTests.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# ParseAndAddDrogonTests(${PROJECT_NAME}) #
1818
#==================================================================================================#
1919

20-
cmake_minimum_required(VERSION 3.5)
20+
cmake_minimum_required(VERSION 3.5...3.31)
2121

2222
# This removes the contents between
2323
# - block comments (i.e. /* ... */)

cmake_modules/FindJsoncpp.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ if(Jsoncpp_FOUND)
5151
COMMAND awk "{ printf \$3 }"
5252
COMMAND sed -e "s/\"//g"
5353
OUTPUT_VARIABLE jsoncpp_ver)
54-
message(STATUS "jsoncpp version:" ${jsoncpp_ver})
54+
if(NOT Jsoncpp_FIND_QUIETLY)
55+
message(STATUS "jsoncpp version:" ${jsoncpp_ver})
56+
endif()
5557
if(jsoncpp_ver LESS 1.7)
5658
message(
5759
FATAL_ERROR

lib/inc/drogon/RequestStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class StreamError final : public std::exception
8888
* An interface for stream request reading.
8989
* User should create an implementation class, or use built-in handlers
9090
*/
91-
class RequestStreamReader
91+
class DROGON_EXPORT RequestStreamReader
9292
{
9393
public:
9494
virtual ~RequestStreamReader() = default;

0 commit comments

Comments
 (0)