Skip to content

Commit

Permalink
fltk/CMake: Do not export executable 'fluid'
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
schnitzeltony authored and kraj committed Aug 20, 2021
1 parent 45bd40b commit f45df17
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
2 changes: 2 additions & 0 deletions meta-oe/recipes-support/fltk/fltk.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
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 <[email protected]>
---
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

0 comments on commit f45df17

Please sign in to comment.