diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-07-16 07:09:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 16:09:02 -0700 |
| commit | 5a4e2c0484878a28f27ffd66caf39cc3507ca205 (patch) | |
| tree | 8acca436232480080c5af1deef61b31f413efa90 /ports/libyuv/fix-build-type.patch | |
| parent | 0b78ddc14bf513ddc33fe70099c5993d789c7081 (diff) | |
| download | vcpkg-5a4e2c0484878a28f27ffd66caf39cc3507ca205.tar.gz vcpkg-5a4e2c0484878a28f27ffd66caf39cc3507ca205.zip | |
[libyuv] Fix static build issue (#12338)
* [libyuv] Fix static build issue
* Update the patch and replace the definition i headers file
Diffstat (limited to 'ports/libyuv/fix-build-type.patch')
| -rw-r--r-- | ports/libyuv/fix-build-type.patch | 115 |
1 files changed, 62 insertions, 53 deletions
diff --git a/ports/libyuv/fix-build-type.patch b/ports/libyuv/fix-build-type.patch index cb3ffdec8..179a7f7ea 100644 --- a/ports/libyuv/fix-build-type.patch +++ b/ports/libyuv/fix-build-type.patch @@ -1,53 +1,62 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 097434b..8f8864f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,21 +28,25 @@ LIST ( SORT ly_unittest_sources ) - INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} ) - - # this creates the static library (.a) -+if (NOT BUILD_SHARED_LIBS) - ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) - SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h ) -- -+else() - # this creates the shared library (.so) - ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) - SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) - SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) -- -+endif() - # this creates the conversion tool - ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) --TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) -- -+if (BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_shared} ) -+else() -+ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) -+endif() - - INCLUDE ( FindJPEG ) --if (JPEG_FOUND) -+if (JPEG_FOUND AND BUILD_SHARED_LIBS) - include_directories( ${JPEG_INCLUDE_DIR} ) - target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} ) - target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) -@@ -88,11 +92,13 @@ endif() - - - # install the conversion tool, .so, .a, and all the header files --INSTALL ( TARGETS yuvconvert DESTINATION bin ) -+INSTALL ( TARGETS yuvconvert DESTINATION tools ) - INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv ) --INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include ) --INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) -- -+if (NOT BUILD_SHARED_LIBS) -+ INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include ) -+else() -+ INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) -+endif() - INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES ) - - # create the .deb and .rpm packages using cpack +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50442cd..fdc82f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,24 +28,32 @@ LIST ( SORT ly_unittest_sources )
+ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
+
+ # this creates the static library (.a)
++if (NOT BUILD_SHARED_LIBS)
+ ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} )
+ SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h )
+-
++else()
+ # this creates the shared library (.so)
+ ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} )
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" )
+ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
+-
++endif()
+ # this creates the conversion tool
+ ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
+-TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
+-
++if (BUILD_SHARED_LIBS)
++ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_shared} )
++else()
++ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
++endif()
+
+ INCLUDE ( FindJPEG )
+ if (JPEG_FOUND)
+- include_directories( ${JPEG_INCLUDE_DIR} )
+- target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} )
+- target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
++ include_directories( ${JPEG_INCLUDE_DIR})
++ if( BUILD_SHARED_LIBS)
++ target_link_libraries(${ly_lib_shared} PUBLIC ${JPEG_LIBRARY})
++ else()
++ target_link_libraries(${ly_lib_static} PUBLIC ${JPEG_LIBRARY})
++ endif()
++ target_link_libraries(yuvconvert ${JPEG_LIBRARY})
+ add_definitions( -DHAVE_JPEG )
+ endif()
+
+@@ -88,11 +96,13 @@ endif()
+
+
+ # install the conversion tool, .so, .a, and all the header files
+-INSTALL ( TARGETS yuvconvert DESTINATION bin )
++INSTALL ( TARGETS yuvconvert DESTINATION tools )
+ INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv )
+-INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
+-INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
+-
++if (NOT BUILD_SHARED_LIBS)
++ INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
++else()
++ INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
++endif()
+ INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES )
+
+ # create the .deb and .rpm packages using cpack
|