diff options
| author |   Frederico Cadete <frederico.cadete@awtce.be> | 2016-04-06 19:08:40 +0900 |
|---|---|---|
| committer |   Yong-iL Joh <yong-il.joh@windriver.com> | 2016-04-15 23:13:38 +0900 |
| commit | 48b419d6f52832d9eb8a156661c2c6a35a678ebe (patch) | |
| tree | 4a302817572be2da3991eaea8be6c9a461a1e442 | |
| parent | 27a68705abef65672a98dfad2f603270beca15ed (diff) | |
| download | meta-ivi-48b419d6f52832d9eb8a156661c2c6a35a678ebe.tar.gz meta-ivi-48b419d6f52832d9eb8a156661c2c6a35a678ebe.tar.bz2 meta-ivi-48b419d6f52832d9eb8a156661c2c6a35a678ebe.zip | |
common-api: remove unnecessary patching of CMakeLists.txt
The substitution performed on CMakeLists.txt has been
applied upstream on version 3.1.3.
Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be>
| -rw-r--r-- | meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb | 5 | ||||
| -rw-r--r-- | meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb index 36b36db..1426d9c 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++-dbus_3.1.5.bb @@ -13,10 +13,5 @@ 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++_3.1.5.bb b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb index 907c25d..66308d4 100644 --- a/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb +++ b/meta-ivi/recipes-extended/common-api/common-api-c++_3.1.5.bb @@ -13,10 +13,5 @@ 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" -RDEPENDS_${PN} += "dlt-daemon"
\ No newline at end of file +RDEPENDS_${PN} += "dlt-daemon" |