From 8417b59f26fb0ace0a9fae409b9a2dbe3772cb48 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sat, 13 Feb 2016 20:47:00 +0300 Subject: [PATCH] qjson: install pkg-config file --- src/qjson-1-fixes.patch | 22 ++++++++++++++++++++++ src/qjson-test.cpp | 7 +++++++ src/qjson.mk | 5 +++++ 3 files changed, 34 insertions(+) create mode 100644 src/qjson-1-fixes.patch create mode 100644 src/qjson-test.cpp diff --git a/src/qjson-1-fixes.patch b/src/qjson-1-fixes.patch new file mode 100644 index 00000000..98bf3938 --- /dev/null +++ b/src/qjson-1-fixes.patch @@ -0,0 +1,22 @@ +This file is part of MXE. +See index.html for further information. + +diff -Naur qjson-0.8.1.orig/CMakeLists.txt qjson-0.8.1/CMakeLists.txt +--- qjson-0.8.1.orig/CMakeLists.txt 2012-11-27 14:06:57.000000000 +0400 ++++ qjson-0.8.1/CMakeLists.txt 2016-02-13 03:00:18.725982532 +0300 +@@ -56,13 +56,13 @@ + set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" ) + + # pkg-config +-IF (NOT WIN32) ++#IF (NOT WIN32) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + @ONLY) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +-ENDIF (NOT WIN32) ++#ENDIF (NOT WIN32) + + # Subdirs + ADD_SUBDIRECTORY(src) diff --git a/src/qjson-test.cpp b/src/qjson-test.cpp new file mode 100644 index 00000000..78c218b3 --- /dev/null +++ b/src/qjson-test.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + QJson::Parser p; + return 0; +} diff --git a/src/qjson.mk b/src/qjson.mk index 76e2659e..375918d7 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -22,4 +22,9 @@ define $(PKG)_BUILD -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/build' -j '$(JOBS)' install + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' QJson --cflags --libs` endef