diff options
-rw-r--r-- | recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch | 42 | ||||
-rw-r--r-- | recipes-qt/tufao/tufao_1.2.1.bb | 31 |
2 files changed, 73 insertions, 0 deletions
diff --git a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch new file mode 100644 index 00000000..a6da1ae4 --- /dev/null +++ b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 878c5a2a47d620f36dd281d4b0eb6677a8a1fbd4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Sat, 7 Jun 2014 18:13:14 -0300 | ||
4 | Subject: [PATCH] build: Fix mkspecs and CMake module install directories | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Upstream-Status: Inapropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | --- | ||
11 | CMakeLists.txt | 2 +- | ||
12 | pkg/CMakeLists.txt | 2 +- | ||
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index d78fedf..1f4db6b 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -27,7 +27,7 @@ endfunction(QUERY_QMAKE) | ||
20 | query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) | ||
21 | query_qmake(QT_HOST_DATA QT_DATA_DIR) | ||
22 | |||
23 | -set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) | ||
24 | +set(QT_MKSPECS_DIR ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs) | ||
25 | |||
26 | # Configure options | ||
27 | option(GENERATE_DOC | ||
28 | diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt | ||
29 | index 25891a5..a87fedd 100644 | ||
30 | --- a/pkg/CMakeLists.txt | ||
31 | +++ b/pkg/CMakeLists.txt | ||
32 | @@ -19,6 +19,6 @@ if(PKG_CONFIG_FOUND) | ||
33 | ) | ||
34 | endif(PKG_CONFIG_FOUND) | ||
35 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/FindTufao${TUFAO_VERSION_MAJOR}.cmake" | ||
36 | - DESTINATION "${CMAKE_ROOT}/Modules" | ||
37 | + DESTINATION "${libdir}/cmake" | ||
38 | COMPONENT development | ||
39 | ) | ||
40 | -- | ||
41 | 2.0.0.rc4 | ||
42 | |||
diff --git a/recipes-qt/tufao/tufao_1.2.1.bb b/recipes-qt/tufao/tufao_1.2.1.bb new file mode 100644 index 00000000..34b28b78 --- /dev/null +++ b/recipes-qt/tufao/tufao_1.2.1.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | SUMMARY = "An asynchronous web framework for C++ built on top of Qt" | ||
2 | LICENSE = "LGPL-2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" | ||
4 | DEPENDS = "qtbase" | ||
5 | |||
6 | SRCREV = "a4832b4c941b5ff3f5fab23adcff39e6ad6cb4e5" | ||
7 | SRC_URI = "git://github.com/vinipsmaker/tufao.git;protocol=http \ | ||
8 | file://build-Fix-mkspecs-and-CMake-module-install-directori.patch" | ||
9 | |||
10 | # This includes bugfixes from 1.x branch | ||
11 | PV_append = "+${SRCPV}" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit cmake_qt5 | ||
16 | |||
17 | PACKAGES += "${PN}-mkspecs" | ||
18 | |||
19 | FILES_${PN}-mkspecs = "\ | ||
20 | ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ | ||
21 | " | ||
22 | |||
23 | FILES_${PN}-dev += " \ | ||
24 | ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ | ||
25 | ${OE_QMAKE_PATH_LIBS}/pkgconfig \ | ||
26 | ${OE_QMAKE_PATH_LIBS}/cmake/* \ | ||
27 | ${OE_QMAKE_PATH_LIBS}/*.prl \ | ||
28 | ${OE_QMAKE_PATH_LIBS}/*.la \ | ||
29 | ${OE_QMAKE_PATH_DATA}/* \ | ||
30 | ${OE_QMAKE_PATH_HEADERS}/* \ | ||
31 | " | ||