Re: [oe] [meta-oe][master-next][PATCH] rely on cmake.bbclass to put cmake package files in dev package

2018-05-20 Thread Trevor Woerner 
On Sun, May 20, 2018 at 6:27 PM, Khem Raj  wrote:

> Hi Trevor
>
> On Sat, May 19, 2018 at 7:41 PM, Trevor Woerner 
> wrote:
>
> > --- a/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
> > +++ b/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
> > @@ -74,7 +74,6 @@ FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom"
> >  FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom"
> >  FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf"
> >
> > -FILES_${PN}-dev += "${libdir}/cmake"
>
> fftw can be built using both autotools and cmake, for OE we use autotools
> therefore it does not inherit cmake, so please reinstate this change
> in next version of patch.
>


No problem; thanks for the review!
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-oe][master-next][PATCH] rely on cmake.bbclass to put cmake package files in dev package

2018-05-20 Thread Khem Raj 
Hi Trevor

On Sat, May 19, 2018 at 7:41 PM, Trevor Woerner  wrote:

> --- a/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
> +++ b/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
> @@ -74,7 +74,6 @@ FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom"
>  FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom"
>  FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf"
>
> -FILES_${PN}-dev += "${libdir}/cmake"

fftw can be built using both autotools and cmake, for OE we use autotools
therefore it does not inherit cmake, so please reinstate this change
in next version of patch.

>  RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf"
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][master-next][PATCH] rely on cmake.bbclass to put cmake package files in dev package

2018-05-19 Thread Trevor Woerner 
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.


http://git.openembedded.org/openembedded-core/commit/?id=d91dc483a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy 
Signed-off-by: Trevor Woerner 
---
 .../recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb   | 1 -
 meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 2 +-
 meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb  | 2 --
 meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb   | 1 -
 meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb| 2 --
 meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb   | 1 -
 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 2 --
 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 1 -
 meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb| 1 -
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb | 2 --
 meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb   | 2 --
 meta-oe/recipes-support/fftw/fftw_3.3.7.bb  | 1 -
 meta-oe/recipes-support/gflags/gflags_2.2.0.bb  | 2 --
 meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb  | 2 +-
 meta-oe/recipes-support/libftdi/libftdi_1.4.bb  | 2 --
 meta-oe/recipes-support/libssh/libssh_0.7.3.bb  | 1 -
 meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb| 2 --
 meta-oe/recipes-support/opencv/opencv_3.3.bb| 2 +-
 18 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb 
b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
index ea262f855b..f38414862a 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb
@@ -23,5 +23,4 @@ PACKAGECONFIG[testapps] = 
"-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON,
 
 PACKAGES =+ "${PN}-testapps"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*"
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb 
b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
index 1b56685c57..dcc2edf76e 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
@@ -34,7 +34,7 @@ do_install_append () {
 PACKAGES =+ "openobex-apps"
 FILES_${PN}-apps = "${bindir}/*"
 FILES_${PN} += "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/openobex-config ${libdir}/cmake"
+FILES_${PN}-dev += "${bindir}/openobex-config"
 DEBIAN_NOAUTONAME_${PN}-apps = "1"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb 
b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index 9a2f9dd1c5..a3b06fd133 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -30,5 +30,3 @@ EXTRA_OECMAKE = "\
 -DWITH_TESTS=OFF \
 -DWITH_TOOLS=OFF \
 "
-
-FILES_${PN}-dev += "${libdir}/cmake"
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb 
b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
index ffbe73feee..dfe19947c0 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
@@ -20,7 +20,6 @@ S = "${WORKDIR}/git/c++"
 PACKAGE_BEFORE_PN = "${PN}-compiler"
 RDEPENDS_${PN}-dev += "${PN}-compiler"
 
-FILES_${PN}-dev += "${libdir}/cmake"
 FILES_${PN}-compiler = "${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb 
b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index c7c1ad1eca..3c1d8a9959 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -20,6 +20,4 @@ DEPENDS = "boost"
 
 inherit cmake
 
-FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibJsonSpirit.cmake"
-
 BBCLASSEXTEND = "nativesdk"
diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb 
b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
index 267c0e79f5..dcd47a4e69 100644
--- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
+++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
@@ -47,7 +47,6 @@ PACKAGECONFIG[demos] = 
"-DLIBRCF_BUILD_DEMOS=ON,-DLIBRCF_BUILD_DEMOS=OFF,"
 PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'demos', '${PN}-demos', '', 
d)}"
 
 FILES_${PN}-demos = "${bindir}/*"
-FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibRcf.cmake"
 
 BBCLASSEXTEND = "nativesdk"
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb 
b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
index 02c0cd2964..3ae4c1f879 100644
---