[poppler] Branch 'qt5' - 2 commits - poppler-qt5.pc.cmake poppler-qt5.pc.in poppler-qt5-uninstalled.pc.in qt5/src

[Albert Astals Cid]

 poppler-qt5-uninstalled.pc.in |    7 +++++++
 poppler-qt5.pc.cmake          |   13 +++++++++++++
 poppler-qt5.pc.in             |   13 +++++++++++++
 qt5/src/CMakeLists.txt        |    2 +-
 qt5/src/Makefile.am           |    2 +-
 5 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit cb617c21fba727781f46278f5475b91d528a488b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 18:12:18 2013 +0200

    Files i forgot

diff --git a/poppler-qt5-uninstalled.pc.in b/poppler-qt5-uninstalled.pc.in
new file mode 100644
index 0000000..a91e1d5
--- /dev/null
+++ b/poppler-qt5-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-qt5
+Description: Qt5 bindings for poppler - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@ 
+
+Libs: ${pc_top_builddir}/${pcfiledir}/qt5/src/libpoppler-qt5.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/qt5/src
diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
new file mode 100644
index 0000000..b4d87b7
--- /dev/null
+++ b/poppler-qt5.pc.cmake
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
+includedir=${prefix}/include
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+ at PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
diff --git a/poppler-qt5.pc.in b/poppler-qt5.pc.in
new file mode 100644
index 0000000..cda4c6f
--- /dev/null
+++ b/poppler-qt5.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @VERSION@
+Requires: @PC_REQUIRES@
+ at PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
commit 5c521bba427eb163e4b77d936865fbdd0e07faf3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 18:12:07 2013 +0200

    soversion 1

diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
index ad6e6fb..ddbbb12 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -33,7 +33,7 @@ set(poppler_qt5_SRCS
 )
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
 add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
-set_target_properties(poppler-qt5 PROPERTIES VERSION 5.0.0 SOVERSION 5)
+set_target_properties(poppler-qt5 PROPERTIES VERSION 1.0.0 SOVERSION 1)
 target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
 if(MSVC)
 target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am
index ec52c80..e31e5fe 100644
--- a/qt5/src/Makefile.am
+++ b/qt5/src/Makefile.am
@@ -61,7 +61,7 @@ libpoppler_qt5_la_LIBADD = 			\
 	$(top_builddir)/poppler/libpoppler-arthur.la	\
 	$(POPPLER_QT5_LIBS)
 
-libpoppler_qt5_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt5_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@ @auto_import_flags@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc: