diff options
Diffstat (limited to 'ports/libftdi/shared-static.patch')
| -rw-r--r-- | ports/libftdi/shared-static.patch | 18 |
1 files changed, 16 insertions, 2 deletions
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
|