mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
a002157339
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.
24 lines
1.0 KiB
Plaintext
24 lines
1.0 KiB
Plaintext
--- CMakeLists.txt.orig 2017-01-24 21:36:21 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -25,7 +25,11 @@ if (NOT DEFINED CMAKE_CONFIGURATION_TYPES AND NOT CMAK
|
|
set (CMAKE_BUILD_TYPE "${default}" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
|
|
endif ()
|
|
|
|
-# C++14 support, warnings and other flags
|
|
+# C++17 support, warnings and other flags
|
|
+#
|
|
+# 17 is needed for std::optional, in qxmpp
|
|
+set (CMAKE_CXX_STANDARD 17)
|
|
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
set (DEFINITIONS QT_NO_CAST_TO_ASCII QT_DISABLE_DEPRECATED_BEFORE=0x040900)
|
|
list (APPEND DEFINITIONS KADU_EXPORT_TESTS)
|
|
@@ -38,7 +42,6 @@ else ()
|
|
set (COMMON_COMPILE_FLAGS "-Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -fno-common")
|
|
set (C_FLAGS "-Wwrite-strings")
|
|
set (CXX_FLAGS "-Woverloaded-virtual -Wnon-virtual-dtor ${CXX_FLAGS}")
|
|
- set (CMAKE_CXX_STANDARD 14)
|
|
|
|
if (NOT WIN32)
|
|
set (COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fvisibility=hidden")
|