diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2021-08-19 13:02:44 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-08-20 09:26:18 -0700 |
| commit | f45df170dc8ece71b4025636605b7b425d7673ea (patch) | |
| tree | 44e7cd4254682db9a8f3c333b7a0427b3ea43120 | |
| parent | 45bd40bd36587cd596c4099377b6bb8b0e6226f4 (diff) | |
| download | meta-openembedded-contrib-f45df170dc8ece71b4025636605b7b425d7673ea.tar.gz | |
fltk/CMake: Do not export executable 'fluid'
It does not work for us: The executable 'fluid' is not installed in
receipe-sysroot. So fltk cmake config contains an invalid reference.
Consumers of fltk using cmake will fail during configure for this invalid
reference with something like:
| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message):
| The imported target "fluid" references the file
|
| "<...>/recipe-sysroot/usr/bin/fluid"
|
| but this file does not exist.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/fltk/fltk.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch | 42 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index ca2b517d72..3c9ee5ee3f 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -5,6 +5,8 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" + EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ diff --git a/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 0000000000..72bb48a32c --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch @@ -0,0 +1,42 @@ +From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 19 Aug 2021 08:06:45 +0200 +Subject: [PATCH] fluid/CMakeLists.txt: Do not export fluid target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It does not work for us: The executable 'fluid' is not installed in +receipe-sysroot. So fltk cmake config contains an invalid reference. +Consumers of fltk using cmake will fail during configure for this invalid +reference with something like: + +| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message): +| The imported target "fluid" references the file +| +| "<...>/recipe-sysroot/usr/bin/fluid" +| +| but this file does not exist. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + fluid/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt +index 472c84c..f971121 100644 +--- a/fluid/CMakeLists.txt ++++ b/fluid/CMakeLists.txt +@@ -86,7 +86,6 @@ if (APPLE AND (NOT OPTION_APPLE_X11)) + install (TARGETS fluid DESTINATION ${FLTK_BINDIR}) + else() + install (TARGETS fluid +- EXPORT FLTK-Targets + RUNTIME DESTINATION ${FLTK_BINDIR} + LIBRARY DESTINATION ${FLTK_LIBDIR} + ARCHIVE DESTINATION ${FLTK_LIBDIR} +-- +2.31.1 + |