]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/quazip/vcpkg_remove_extra_static.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / quazip / vcpkg_remove_extra_static.patch
diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/quazip/vcpkg_remove_extra_static.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/quazip/vcpkg_remove_extra_static.patch
new file mode 100644 (file)
index 0000000..e600424
--- /dev/null
@@ -0,0 +1,30 @@
+diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt\r
+index 1efb5e2..2412b8a 100644\r
+--- a/quazip/CMakeLists.txt\r
++++ b/quazip/CMakeLists.txt\r
+@@ -10,22 +10,13 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD)\r
+ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})\r
+ set(SRCS ${SRCS} ${MOC_SRCS})\r
\r
+-add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})\r
+-add_library(quazip_static STATIC ${SRCS})\r
+- \r
+-# Windows uses .lib extension for both static and shared library\r
+-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name\r
+-if (NOT WIN32)\r
+-      set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})\r
+-endif ()\r
++add_library(${QUAZIP_LIB_TARGET_NAME} ${SRCS})\r
\r
+ target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})\r
+-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})\r
+-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)\r
++set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)\r
\r
+ # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)\r
+ target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})\r
+-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})\r
\r
+ install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})\r
+-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})\r
++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})\r