1*4882a593SmuzhiyunFrom 3e68fd7da98a755403cf5719c3d7a3c2f4dcbb58 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 17 Jul 2020 21:04:45 +0200 4*4882a593SmuzhiyunSubject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUse the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP 7*4882a593Smuzhiyunis enabled as suggested by Aurelien Jarno in 8*4882a593Smuzhiyunhttp://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunWithout this change, the libftdi1.pc config file defines the include 11*4882a593Smuzhiyunpath as /usr/local/include/libftdipp1 while the ftdi.h file is actually 12*4882a593Smuzhiyuninstalled in /usr/local/include/libftdi1 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunThis is an issue for example for libsigrok which will fail on: 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunIn file included from src/hardware/asix-sigma/protocol.c:27: 17*4882a593Smuzhiyunsrc/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory 18*4882a593Smuzhiyun 28 | #include <ftdi.h> 19*4882a593Smuzhiyun | ^~~~~~~~ 20*4882a593Smuzhiyun 21*4882a593SmuzhiyunFixes: 22*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe 23*4882a593Smuzhiyun 24*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 25*4882a593Smuzhiyun[Upstream status: 26*4882a593Smuzhiyunhttp://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00045.html] 27*4882a593Smuzhiyun--- 28*4882a593Smuzhiyun CMakeLists.txt | 2 +- 29*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyundiff --git a/CMakeLists.txt b/CMakeLists.txt 32*4882a593Smuzhiyunindex 5aecafc..3b0b87c 100644 33*4882a593Smuzhiyun--- a/CMakeLists.txt 34*4882a593Smuzhiyun+++ b/CMakeLists.txt 35*4882a593Smuzhiyun@@ -136,7 +136,7 @@ endif () 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun add_subdirectory(src) 38*4882a593Smuzhiyun if ( FTDIPP ) 39*4882a593Smuzhiyun- project(libftdipp1 C CXX) 40*4882a593Smuzhiyun+ project(libftdi1 C CXX) 41*4882a593Smuzhiyun add_subdirectory(ftdipp) 42*4882a593Smuzhiyun endif () 43*4882a593Smuzhiyun if ( PYTHON_BINDINGS ) 44*4882a593Smuzhiyun-- 45*4882a593Smuzhiyun2.27.0 46*4882a593Smuzhiyun 47