Merge pull request #9 from deztructor/master

[pkg-config] adding contextsubscriber-1.0
sailfishos · Apr 25, 2014 · 58fefd4 · 58fefd4
2 parents 9ff16e1 + 6f2644d
commit 58fefd4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(statefs-qt)
 cmake_minimum_required(VERSION 2.8)
 
-IF(NOT DEFINED STATEFS_QT_VERSION)
-  message(fatal_error "define STATEFS_QT_VERSION")
-ENDIF(NOT DEFINED STATEFS_QT_VERSION)
+IF(NOT DEFINED VERSION)
+  message(fatal_error "define VERSION")
+ENDIF(NOT DEFINED VERSION)
 
 option(ENABLE_QT4 "Build Qt4 version of libraries" OFF)
 
@@ -95,4 +95,4 @@ add_subdirectory(tests)
 add_subdirectory(tools/monitor)
 
 MESSAGE(STATUS "QT4=${ENABLE_QT4}")
-MESSAGE(STATUS "STATEFS_QT_VERSION=${STATEFS_QT_VERSION}")
+MESSAGE(STATUS "VERSION=${VERSION}")
diff --git a/rpm/statefs-qt5.spec b/rpm/statefs-qt5.spec
@@ -56,7 +56,7 @@ Contextkit property interface using statefs instead of contextkit
 %setup -q
 
 %build
-%cmake -DSTATEFS_QT_VERSION=%{version} %{?_with_multiarch:-DENABLE_MULTIARCH=ON}
+%cmake -DVERSION=%{version} %{?_with_multiarch:-DENABLE_MULTIARCH=ON}
 make %{?jobs:-j%jobs}
 make doc
 
@@ -92,4 +92,5 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}/contextproperty.h
 %{_libdir}/pkgconfig/contextkit-statefs.pc
+%{_libdir}/pkgconfig/contextsubscriber-1.0.pc
 
diff --git a/src/contextkit-subscriber/CMakeLists.txt b/src/contextkit-subscriber/CMakeLists.txt
@@ -3,6 +3,7 @@ set(CMAKE_AUTOMOC TRUE)
 if(ENABLE_QT4)
 
 configure_file(contextkit-statefs-qt4.pc.in contextkit-statefs-qt4.pc @ONLY)
+configure_file(contextsubscriber-1.0.pc.in contextsubscriber-1.0.pc @ONLY)
 
 # dirty hack: absolute path, moc is $$$
 qt4_wrap_cpp(LIB_MOC_SRC
@@ -21,10 +22,12 @@ target_link_libraries(contextkit-statefs-qt4
 
 install(TARGETS contextkit-statefs-qt4 DESTINATION ${DST_LIB})
 install(FILES contextkit-statefs-qt4.pc DESTINATION ${DST_LIB}/pkgconfig)
+install(FILES contextsubscriber-1.0.pc DESTINATION ${DST_LIB}/pkgconfig)
 
 else(ENABLE_QT4)
 
 configure_file(contextkit-statefs.pc.in contextkit-statefs.pc @ONLY)
+configure_file(contextsubscriber-1.0.pc.in contextsubscriber-1.0.pc @ONLY)
 
 qt5_wrap_cpp(LIB_MOC_SRC
   ${CMAKE_SOURCE_DIR}/include/contextsubscriber/contextproperty.h actor.hpp
@@ -42,5 +45,6 @@ target_link_libraries(contextkit-statefs-qt5
 
 install(TARGETS contextkit-statefs-qt5 DESTINATION ${DST_LIB})
 install(FILES contextkit-statefs.pc DESTINATION ${DST_LIB}/pkgconfig)
+install(FILES contextsubscriber-1.0.pc DESTINATION ${DST_LIB}/pkgconfig)
 
 endif(ENABLE_QT4)
diff --git a/src/contextkit-subscriber/contextkit-statefs-qt4.pc.in b/src/contextkit-subscriber/contextkit-statefs-qt4.pc.in
@@ -4,6 +4,6 @@ includedir=${prefix}/include/qt4
 
 Name: contextkit-statefs-qt4
 Description: Contextkit subscriber Qt4 interface to statefs
-Version: @STATEFS_QT_VERSION@
+Version: @VERSION@
 Libs: -lcontextkit-statefs-qt4
 Cflags: -I${includedir}/contextsubscriber
diff --git a/src/contextkit-subscriber/contextkit-statefs.pc.in b/src/contextkit-subscriber/contextkit-statefs.pc.in
@@ -1,9 +1,9 @@
 prefix=@prefix@
 libdir=${prefix}/@DST_LIB@
-includedir=${prefix}/include/qt5
+includedir=${prefix}/include
 
 Name: contextkit-statefs
 Description: Contextkit subscriber Qt5 interface to statefs
-Version: @STATEFS_QT_VERSION@
-Libs: -lcontextkit-statefs-qt5
+Version: @VERSION@
+Libs: -L${libdir} -lcontextkit-statefs-qt5
 Cflags: -I${includedir}
diff --git a/src/contextkit-subscriber/contextsubscriber-1.0.pc.in b/src/contextkit-subscriber/contextsubscriber-1.0.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=${prefix}/@DST_LIB@
+includedir=${prefix}/include
+
+Name: contextsubscriber-1.0
+Description: Contextkit subscriber Qt5 interface to statefs
+Version: @VERSION@
+Libs: -L${libdir} -lcontextkit-statefs-qt5
+Cflags: -I${includedir}
diff --git a/src/util/statefs-qt4.pc.in b/src/util/statefs-qt4.pc.in
@@ -4,6 +4,6 @@ includedir=${prefix}/include/qt4
 
 Name: statefs-qt4
 Description: StateFS Qt4 development
-Version: @STATEFS_QT_VERSION@
+Version: @VERSION@
 Libs: -lstatefs-qt4
 Cflags: -I${includedir}
diff --git a/src/util/statefs-qt5.pc.in b/src/util/statefs-qt5.pc.in
@@ -5,5 +5,5 @@ includedir=${prefix}/include/qt5
 Name: statefs-qt5
 Description: StateFS Qt5 development
 Version: @STATEFS_QT_VERSION@
-Libs: -lstatefs-qt5
+Libs: -L${libdir} -lstatefs-qt5
 Cflags: -I${includedir}