Attachment 135217 Details for Bug 103157 – Add soversion suffix to dlls (V3)

[patch] Add soversion suffix to dlls (V3)

poppler_so-suffix.patch (text/plain), 3.95 KB, created by Sandro Mani on 2017-11-02 23:17:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2017-11-02 23:17:48 UTC

Size: 3.95 KB

patch

obsolete

>diff -rupN poppler-0.60.1/CMakeLists.txt poppler-0.60.1-new/CMakeLists.txt
>--- poppler-0.60.1/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/CMakeLists.txt	2017-11-03 00:07:42.547500685 +0100
>@@ -551,6 +551,10 @@ else()
> add_library(poppler ${poppler_SRCS})
> endif()
> set_target_properties(poppler PROPERTIES VERSION 71.0.0 SOVERSION 71)
>+if(MINGW)
>+    get_target_property(POPPLER_SOVERSION poppler SOVERSION)
>+    set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
> install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
> 
>diff -rupN poppler-0.60.1/cpp/CMakeLists.txt poppler-0.60.1-new/cpp/CMakeLists.txt
>--- poppler-0.60.1/cpp/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/cpp/CMakeLists.txt	2017-11-03 00:07:13.389570320 +0100
>@@ -24,6 +24,10 @@ set(poppler_cpp_SRCS
> 
> add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
> set_target_properties(poppler-cpp PROPERTIES VERSION 0.3.0 SOVERSION 0)
>+if(MINGW)
>+    get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
>+    set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES})
> install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
> 
>diff -rupN poppler-0.60.1/glib/CMakeLists.txt poppler-0.60.1-new/glib/CMakeLists.txt
>--- poppler-0.60.1/glib/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/glib/CMakeLists.txt	2017-11-03 00:06:58.703605448 +0100
>@@ -82,6 +82,10 @@ set(poppler_glib_generated_SRCS
> )
> add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
> set_target_properties(poppler-glib PROPERTIES VERSION 8.9.0 SOVERSION 8)
>+if(MINGW)
>+    get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
>+    set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
> if(HAVE_PTHREAD)
>    target_link_libraries(poppler-glib -lpthread)
>diff -rupN poppler-0.60.1/qt4/src/CMakeLists.txt poppler-0.60.1-new/qt4/src/CMakeLists.txt
>--- poppler-0.60.1/qt4/src/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/qt4/src/CMakeLists.txt	2017-11-03 00:06:37.197656958 +0100
>@@ -31,6 +31,10 @@ set(poppler_qt4_SRCS
> qt4_automoc(${poppler_qt4_SRCS})
> add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
> set_target_properties(poppler-qt4 PROPERTIES VERSION 4.11.0 SOVERSION 4)
>+if(MINGW)
>+    get_target_property(POPPLER_QT4_SOVERSION poppler-qt4 SOVERSION)
>+    set_target_properties(poppler-qt4 PROPERTIES SUFFIX "-${POPPLER_QT4_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
> if(MSVC)
> target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
>diff -rupN poppler-0.60.1/qt5/src/CMakeLists.txt poppler-0.60.1-new/qt5/src/CMakeLists.txt
>--- poppler-0.60.1/qt5/src/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/qt5/src/CMakeLists.txt	2017-11-03 00:06:22.975691068 +0100
>@@ -31,6 +31,10 @@ set(poppler_qt5_SRCS
> )
> add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
> set_target_properties(poppler-qt5 PROPERTIES VERSION 1.11.0 SOVERSION 1)
>+if(MINGW)
>+    get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
>+    set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
> if(MSVC)
> target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})

Actions: View | Splinter Review

Attachments on bug 103157: 134761 | 134762 | 135216 | 135217

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.