[gentoo-commits] gentoo-x86 commit in dev-util/kdevelop/files: kdevelop-4.5.2-kdevplatform-without-qjson.patch

[Johannes Huber (johu)]

johu        13/11/04 14:30:29

  Added:                kdevelop-4.5.2-kdevplatform-without-qjson.patch
  Log:
  Fix build on dev-util/kdevplatform[-reviewboard] by adding upstream patch and introducing a use flag reviewboard wrt bug #490002.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.1                  dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch?rev=1.1&content-type=text/plain

Index: kdevelop-4.5.2-kdevplatform-without-qjson.patch
===================================================================
commit fb4234cd72ceebb200bef13234ea9c36c9a62046
Author: Kevin Funk <kevin@×××××.org>
Date:   Sun Nov 3 22:09:56 2013 +0100

    Check if kdevplatform has JSON support
    
    BUG: 327095

diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
index 84ce3ee..fbdd4db 100644
--- a/languages/cpp/tests/CMakeLists.txt
+++ b/languages/cpp/tests/CMakeLists.txt
@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
 ########### next target ###############
 
 find_package(QJSON)
-if(QJSON_FOUND)
+# Also check that kdevplatform is built with JSON support
+# see: https://bugs.kde.org/show_bug.cgi?id=327095
+if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
   set(cppfilestest_SRCS test_cppfiles.cpp)
   kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
   configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
@@ -67,7 +69,7 @@ if(QJSON_FOUND)
       ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
       kdev4cppduchain
   )
-endif(QJSON_FOUND)
+endif()
 
 ########### next target ###############