Commit ecfee107 authored by Zoltan Gyarmati's avatar Zoltan Gyarmati Committed by Peter Korsgaard
Browse files

qjson: new package



[Peter: misc white space fixes]
Signed-off-by: default avatarZoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 05554f17
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ if BR2_PACKAGE_QT
comment "QT libraries and helper libraries"
source "package/grantlee/Config.in"
source "package/qextserialport/Config.in"
source "package/qjson/Config.in"
source "package/qtuio/Config.in"
source "package/qwt/Config.in"
endif
+7 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_QJSON
	bool "qjson"
	help
	  QJson is a Qt-based library that maps JSON data to
	  QVariant objects and vice versa.

	  http://qjson.sourceforge.net
+29 −0
Original line number Diff line number Diff line
From 529e50939316abc3c4190f89a482b17a4d4b3355 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Date: Sat, 6 Apr 2013 16:54:25 +0200
Subject: [PATCH] fix Qt4 package error in CMakeLists.txt

Avoid checking for uic executable by cmake as it results configure
time error if QtGui isn't installed.

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e65f1..447f209 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks"
 SET(QT_USE_IMPORTED_TARGETS TRUE)
 
 # Find Qt4
-FIND_PACKAGE( Qt4 REQUIRED )
+find_package(Qt4 COMPONENTS QtCore REQUIRED )
 
 IF (NOT WIN32)
   SET( QT_DONT_USE_QTGUI TRUE )
-- 
1.7.10.4

package/qjson/qjson.mk

0 → 100644
+15 −0
Original line number Diff line number Diff line
#############################################################
#
# qjson
#
#############################################################

QJSON_VERSION = 0.8.1

QJSON_SITE = http://github.com/flavio/qjson/tarball/$(QJSON_VERSION)
QJSON_INSTALL_STAGING = YES
QJSON_DEPENDENCIES =  qt
QJSON_LICENSE = LGPLv2.1
QJSON_LICENSE_FILES = COPYING.lib

$(eval $(cmake-package))