]>
Commit | Line | Data |
---|---|---|
bcd53537 JB |
1 | --- libftdi1-1.5/CMakeLists.txt.orig 2020-07-07 21:32:55.000000000 +0200 |
2 | +++ libftdi1-1.5/CMakeLists.txt 2020-07-30 20:20:30.815434396 +0200 | |
3 | @@ -136,7 +136,6 @@ | |
4 | ||
5 | add_subdirectory(src) | |
6 | if ( FTDIPP ) | |
7 | - project(libftdipp1 C CXX) | |
8 | add_subdirectory(ftdipp) | |
9 | endif () | |
10 | if ( PYTHON_BINDINGS ) | |
11 | @@ -157,6 +156,7 @@ | |
12 | set(prefix ${CMAKE_INSTALL_PREFIX}) | |
13 | set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) | |
14 | set(includedir ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) | |
15 | +set(ppincludedir ${CMAKE_INSTALL_PREFIX}/include/libftdipp1) | |
16 | ||
17 | if(${UNIX}) | |
18 | set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) | |
19 | --- libftdi1-1.5/ftdipp/CMakeLists.txt.orig 2020-07-30 20:25:51.163698920 +0200 | |
20 | +++ libftdi1-1.5/ftdipp/CMakeLists.txt 2020-07-30 20:26:21.460201456 +0200 | |
21 | @@ -1,4 +1,5 @@ | |
22 | # vim: ts=2:sw=2:sts=2 | |
23 | +project(libftdipp1 C CXX) | |
24 | ||
25 | # Targets | |
26 | set(cpp_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.cpp CACHE INTERNAL "List of cpp sources" ) | |
27 | @@ -42,6 +43,6 @@ | |
28 | endif () | |
29 | ||
30 | install ( FILES ${cpp_headers} | |
31 | - DESTINATION include/${PROJECT_NAME} | |
32 | + DESTINATION include/libftdipp1 | |
33 | COMPONENT headers | |
34 | ) | |
35 | --- libftdi1-1.5/libftdipp1.pc.in.orig 2020-07-07 21:32:55.000000000 +0200 | |
36 | +++ libftdi1-1.5/libftdipp1.pc.in 2020-07-30 20:50:23.035725105 +0200 | |
37 | @@ -1,7 +1,7 @@ | |
38 | prefix=@prefix@ | |
39 | exec_prefix=@exec_prefix@ | |
40 | libdir=@libdir@ | |
41 | -includedir=@includedir@ | |
42 | +includedir=@ppincludedir@ | |
43 | ||
44 | Name: libftdipp1 | |
45 | Description: C++ wrapper for libftdi1 |