Fixed building for Ubuntu 11.04. Added pkg-config support.

ranzbak [2011-05-02 19:57]
Fixed building for Ubuntu 11.04. Added pkg-config support.

git-svn-id: https://old.setv.nl/svn/swarmtv@306 88541080-9ad6-de11-9093-5254007c1f44
Filename
trunk/swarmtv/cmake_modules/FindGLIB2.cmake
trunk/swarmtv/libswarmtv/CMakeLists.txt
diff --git a/trunk/swarmtv/cmake_modules/FindGLIB2.cmake b/trunk/swarmtv/cmake_modules/FindGLIB2.cmake
index a584231..71a040d 100644
--- a/trunk/swarmtv/cmake_modules/FindGLIB2.cmake
+++ b/trunk/swarmtv/cmake_modules/FindGLIB2.cmake
@@ -48,6 +48,7 @@ else (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS AND GLIB2_PUBLIC_LINK_FLAGS)
       /sw/lib/glib-2.0/include
       /usr/lib64/glib-2.0/include
       /usr/lib/glib-2.0/include
+      /usr/lib/x86_64-linux-gnu/glib-2.0/include
       /include
   )

diff --git a/trunk/swarmtv/libswarmtv/CMakeLists.txt b/trunk/swarmtv/libswarmtv/CMakeLists.txt
index 51b5801..e0a2e5f 100644
--- a/trunk/swarmtv/libswarmtv/CMakeLists.txt
+++ b/trunk/swarmtv/libswarmtv/CMakeLists.txt
@@ -69,6 +69,9 @@ SET_TARGET_PROPERTIES(swarmtv
 		VERSION 1.0.0
 		SOVERSION 1)

+# Generating pkg-config file
+EXEC_PROGRAM( libswarmtv/createpc.sh ARGS ${CMAKE_INSTALL_PREFIX} )
+
 # Installation of the library
 INSTALL(TARGETS swarmtv
 		DESTINATION lib
@@ -78,3 +81,4 @@ INSTALL(FILES swarmtv.h
 		DESTINATION include
 		PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)

+INSTALL(FILES libswarmtv.pc DESTINATION lib/pkgconfig/ )