Skip to content

Commit

Permalink
Fix CMAKE issues mentioned in #2144 and a linking problem which manif…
Browse files Browse the repository at this point in the history
…est 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
  • Loading branch information
eniv authored Nov 26, 2024
1 parent 71b6d57 commit 1765223
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.31)

project(drogon)

Expand Down
2 changes: 1 addition & 1 deletion cmake/ParseAndAddDrogonTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# ParseAndAddDrogonTests(${PROJECT_NAME}) #
#==================================================================================================#

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.31)

# This removes the contents between
# - block comments (i.e. /* ... */)
Expand Down
4 changes: 3 additions & 1 deletion cmake_modules/FindJsoncpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ if(Jsoncpp_FOUND)
COMMAND awk "{ printf \$3 }"
COMMAND sed -e "s/\"//g"
OUTPUT_VARIABLE jsoncpp_ver)
message(STATUS "jsoncpp version:" ${jsoncpp_ver})
if(NOT Jsoncpp_FIND_QUIETLY)
message(STATUS "jsoncpp version:" ${jsoncpp_ver})
endif()
if(jsoncpp_ver LESS 1.7)
message(
FATAL_ERROR
Expand Down
2 changes: 1 addition & 1 deletion lib/inc/drogon/RequestStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class StreamError final : public std::exception
* An interface for stream request reading.
* User should create an implementation class, or use built-in handlers
*/
class RequestStreamReader
class DROGON_EXPORT RequestStreamReader
{
public:
virtual ~RequestStreamReader() = default;
Expand Down

0 comments on commit 1765223

Please sign in to comment.