From 40537b848b0ee9eaee2fb1bf08f838b1e75c9925 Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Wed, 26 Jun 2019 16:35:03 -0700
Subject: [libftdi] resolve ninja error (-w dupbuild=err) (#7055)

---
 ports/libftdi/CONTROL             |  2 +-
 ports/libftdi/export-cmake.patch  | 24 ------------------------
 ports/libftdi/portfile.cmake      |  1 -
 ports/libftdi/shared-static.patch | 18 ++++++++++++++++--
 4 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 ports/libftdi/export-cmake.patch

diff --git a/ports/libftdi/CONTROL b/ports/libftdi/CONTROL
index 3c50a00e2..16ebe6fab 100644
--- a/ports/libftdi/CONTROL
+++ b/ports/libftdi/CONTROL
@@ -1,4 +1,4 @@
 Source: libftdi
-Version: 0.20
+Version: 0.20-1
 Build-Depends: libusb-win32
 Description: FTDI USB driver with bitbang mode (v0.20)
diff --git a/ports/libftdi/export-cmake.patch b/ports/libftdi/export-cmake.patch
deleted file mode 100644
index 29078c25d..000000000
--- a/ports/libftdi/export-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1c326fe..3c1d9ab 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -47,14 +47,19 @@ if(WIN32 OR 1)
- 
-    if(BUILD_SHARED_LIBS)
-    install( TARGETS ftdi
-+            EXPORT ftdi
-             COMPONENT sharedlibs
-             )
- 
-+   target_link_libraries(ftdi PUBLIC $<INSTALL_INTERFACE:include>)
-    else()
-    install( TARGETS ftdi-static
-+            EXPORT ftdi
-             COMPONENT staticlibs
-             )
-+   target_link_libraries(ftdi-static PUBLIC $<INSTALL_INTERFACE:include>)
-    endif()
-+   install(EXPORT ftdi FILE libftdi-config.cmake NAMESPACE libftdi:: DESTINATION share/libftdi)
- 
-    install( FILES ${c_headers}
-             DESTINATION include
diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake
index 29e5bc42d..318e21a9e 100644
--- a/ports/libftdi/portfile.cmake
+++ b/ports/libftdi/portfile.cmake
@@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         libusb-win32.patch
         shared-static.patch
-        export-cmake.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src)
diff --git a/ports/libftdi/shared-static.patch b/ports/libftdi/shared-static.patch
index dad7aa0c5..df76b910b 100644
--- a/ports/libftdi/shared-static.patch
+++ b/ports/libftdi/shared-static.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 071ae90..b42bbcd 100644
+index 071ae90..f91f6f7 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -4,7 +4,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
@@ -11,6 +11,15 @@ index 071ae90..b42bbcd 100644
  set(c_headers     ftdi.h)
  
  add_library(ftdi SHARED ${c_sources})
+@@ -14,7 +14,7 @@ set_target_properties(ftdi PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.
+ 
+ # Static library
+ add_library(ftdi-static STATIC ${c_sources})
+-set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi")
++set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi-static")
+ 
+ # Prevent clobbering each other during the build
+ set_target_properties(ftdi PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 @@ -24,7 +24,7 @@ set_target_properties(ftdi-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
  target_link_libraries(ftdi ${LIBUSB_LIBRARIES})
  
@@ -20,7 +29,7 @@ index 071ae90..b42bbcd 100644
  
     install( TARGETS ftdi
              LIBRARY DESTINATION lib${LIB_SUFFIX}
-@@ -41,23 +41,24 @@ if(${UNIX})
+@@ -41,23 +41,29 @@ if(${UNIX})
              COMPONENT headers
              )
  
@@ -33,15 +42,20 @@ index 071ae90..b42bbcd 100644
 +   if(BUILD_SHARED_LIBS)
     install( TARGETS ftdi
 -            DESTINATION bin
++            EXPORT ftdi
              COMPONENT sharedlibs
              )
  
++   target_link_libraries(ftdi PUBLIC $<INSTALL_INTERFACE:include>)
 +   else()
     install( TARGETS ftdi-static
 -            DESTINATION bin
++            EXPORT ftdi
              COMPONENT staticlibs
              )
++   target_link_libraries(ftdi-static PUBLIC $<INSTALL_INTERFACE:include>)
 +   endif()
++   install(EXPORT ftdi FILE libftdi-config.cmake NAMESPACE libftdi:: DESTINATION share/libftdi)
  
     install( FILES ${c_headers}
              DESTINATION include
-- 
cgit v1.2.3