mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 21:30:31 -04:00
The update of qxmpp to the latest upstream release made qxmpp require C++17, for std::optional. Kadu is forcing C++14, which breaks in the build like this: In file included from plugins/jabber_protocol/services/jabber-room-chat-service.cpp:35: /usr/local/include/qxmpp/QXmppMessage.h:250:10: error: no template named 'optional' in namespace 'std' std::optional<QXmppMixInvitation> mixInvitation() const; Bump the C++ requirement and patch the CMake bits that DTWT.
12 lines
463 B
CMake
12 lines
463 B
CMake
--- cmake/KaduMacros.cmake.orig 2021-04-03 20:24:23 UTC
|
|
+++ cmake/KaduMacros.cmake
|
|
@@ -44,7 +44,8 @@ include_directories (${INJEQT_INCLUDEDIR})
|
|
link_directories (${INJEQT_LIBRARY_DIRS})
|
|
|
|
set (CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CMAKE_CXX_FLAGS}")
|
|
-set (CMAKE_CXX_STANDARD 14)
|
|
+set (CMAKE_CXX_STANDARD 17)
|
|
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
if (NOT WIN32)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
|