Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

13 years ago · b0bd35b1ff
parent c1b7fc8e57 20cb25189f
commit b0bd35b1ff
3 changed files with 14 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -862,6 +862,12 @@ install( FILES
  DESTINATION ${INCLUDE_INSTALL_DIR} )
 ##### pkg-config #################################
 configure_file( tdelibs.pc.cmake tdelibs.pc @ONLY )
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdelibs.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
 ##### subdirectories ############################
 add_subdirectory( dcop )
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6b3a1fc54f258941ae7ae10909a23d32afee9df7
+Subproject commit 6868254e6c10ba5b95ef622b25c39144f3d1161a
--- a/tdelibs.pc.cmake
+++ b/tdelibs.pc.cmake
@ -0,0 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@EXEC_INSTALL_PREFIX@
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
 Name: TDELibs
 Description: Core libraries for Trinity
		`@ -1 +1 @@`
			`Subproject commit 6b3a1fc54f258941ae7ae10909a23d32afee9df7`				`Subproject commit 6868254e6c10ba5b95ef622b25c39144f3d1161a`