aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi/recipes-extended/common-api
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ivi/recipes-extended/common-api')
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb15
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb22
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb14
-rw-r--r--meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb20
4 files changed, 42 insertions, 29 deletions
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb
deleted file mode 100644
index d1d612f..0000000
--- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_2.1.6-p6.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "CommonAPI-DBus"
-SECTION = "libs"
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-
-BRANCH ?= "maintain/2.1.6"
-TAG ?= "${PV}"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;branch=${BRANCH};tag=${TAG}"
-S = "${WORKDIR}/git"
-
-DEPENDS = "common-api2 dbus"
-
-CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
-
-inherit autotools lib_package pkgconfig
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb
new file mode 100644
index 0000000..c1cfa71
--- /dev/null
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.3.bb
@@ -0,0 +1,22 @@
+SUMMARY = "CommonAPI-DBus"
+SECTION = "libs"
+LICENSE = "MPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
+PR = "r1"
+DEPENDS = "commonapi3 dbus"
+REQUIRES = "commonapi3 dbus"
+
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-dbus-runtime.git;branch=master;tag=${PV}"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr "
+CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
+
+do_configure_prepend() {
+ sed -i '/ set(${var} /c set(ABSOLUTE_${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ' ${S}/CMakeLists.txt
+ sed -i '/file(RELATIVE_PATH /c file(RELATIVE_PATH REL_INCLUDE_DIR "${ABSOLUTE_INSTALL_CMAKE_DIR}" "${ABSOLUTE_INSTALL_INCLUDE_DIR}") ' ${S}/CMakeLists.txt
+}
+
+inherit cmake lib_package pkgconfig
+FILES_${PN}-dev += "${libdir}/cmake"
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb
deleted file mode 100644
index 19a3b7a..0000000
--- a/meta-ivi/recipes-extended/common-api/common-api-c++_2.1.6-p1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "CommonAPI"
-SECTION = "libs"
-LICENSE = "MPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
-PROVIDES = "common-api2"
-
-BRANCH ?= "maintain/2.1.6"
-TAG ?= "${PV}"
-SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;branch=${BRANCH};tag=${TAG}"
-S = "${WORKDIR}/git"
-
-CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
-
-inherit autotools lib_package pkgconfig
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb
new file mode 100644
index 0000000..064499d
--- /dev/null
+++ b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.3.bb
@@ -0,0 +1,20 @@
+SUMMARY = "CommonAPI"
+SECTION = "libs"
+LICENSE = "MPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
+PROVIDES = "commonapi3"
+PR = "r1"
+
+inherit autotools cmake lib_package pkgconfig
+
+SRC_URI = "git://git.projects.genivi.org/ipc/common-api-runtime.git;branch=master;tag=${PV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=/usr"
+
+do_configure_prepend () {
+ sed -i '/ set(${var} /c set(ABSOLUTE_${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ' ${S}/CMakeLists.txt
+ sed -i '/file(RELATIVE_PATH /c file(RELATIVE_PATH REL_INCLUDE_DIR "${ABSOLUTE_INSTALL_CMAKE_DIR}" "${ABSOLUTE_INSTALL_INCLUDE_DIR}") ' ${S}/CMakeLists.txt
+}
+
+FILES_${PN}-dev += "${libdir}/cmake"