mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 13:23:30 +00:00
d51084073d
Backport fix for C++ wrapper cmake support. Signed-off-by: Denis Osterland-Heim <denis.osterland@diehl.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 17 Jul 2020 21:25:03 +0200
|
|
Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
|
|
|
|
Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
|
|
is enabled as suggested by Aurelien Jarno in
|
|
http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
|
|
|
|
Without this change, the libftdi1.pc config file defines the include
|
|
path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
|
|
installed in /usr/local/include/libftdi1
|
|
|
|
This is an issue for example for libsigrok which will fail on:
|
|
|
|
In file included from src/hardware/asix-sigma/protocol.c:27:
|
|
src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
|
|
28 | #include <ftdi.h>
|
|
| ^~~~~~~~
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385]
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5aecafc..3b0b87c 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -136,7 +136,7 @@ endif ()
|
|
|
|
add_subdirectory(src)
|
|
if ( FTDIPP )
|
|
- project(libftdipp1 C CXX)
|
|
+ project(libftdi1 C CXX)
|
|
add_subdirectory(ftdipp)
|
|
endif ()
|
|
if ( PYTHON_BINDINGS )
|
|
--
|
|
1.7.1
|
|
|