summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <[email protected]>2018-02-02 23:47:36 +1100
committerMichael Palimaka <[email protected]>2018-02-02 23:47:36 +1100
commit608b97d999fc6fee5ac94bd1d3e073d68c2a44b8 (patch)
tree84b895c04f57770c99c70061d9e22329f8b22657
parent84e99f48acd6a57fd34b2ac91d043510ec33185d (diff)
Remove obsolete QJSON references.
Since f9f8d4b85cfc056845129144d45de52bd2f80cd8, QJSON is no longer searched for. This is because Qt 5 provides native json support. This obsolete QJSON check was preventing the jabber protocol from being built.
-rw-r--r--protocols/CMakeLists.txt4
-rw-r--r--protocols/jabber/CMakeLists.txt1
2 files changed, 2 insertions, 3 deletions
diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt
index e863cf6..f8b5c6a 100644
--- a/protocols/CMakeLists.txt
+++ b/protocols/CMakeLists.txt
@@ -79,12 +79,12 @@ if(NOT WIN32)
endif()
if(Qca-qt5_FOUND AND ZLIB_FOUND)
- if(IDN_FOUND AND QJSON_FOUND)
+ if(IDN_FOUND)
if(WITH_jabber)
add_subdirectory( jabber )
endif()
else()
- message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel or qjson was not found")
+ message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel was not found")
endif()
if(WITH_groupwise)
add_subdirectory( groupwise )
diff --git a/protocols/jabber/CMakeLists.txt b/protocols/jabber/CMakeLists.txt
index 6ea47b8..e2c54be 100644
--- a/protocols/jabber/CMakeLists.txt
+++ b/protocols/jabber/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/libiris/include/iris
${CMAKE_CURRENT_SOURCE_DIR}/libiris/src
${QCA2_INCLUDE_DIR}
- ${QJSON_INCLUDE_DIR}
)
if(BUILD_LIBJINGLE)