From 0e85a70f11e7fe3af645b534cc7b7960ce3ed4d6 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 6 Mar 2012 02:21:16 -0600 Subject: [PATCH 1/3] Reset submodule main/tdelibs/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 6b3a1fc54..ea715e15e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6b3a1fc54f258941ae7ae10909a23d32afee9df7 +Subproject commit ea715e15edb3f6b9e78d631d75e18bb9dbace497 From 592b5277b540ff566a3808f86e558d8e76d00741 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Mar 2012 11:37:00 -0600 Subject: [PATCH 2/3] Add TDELibs .pc This closes Bug 882 Thanks to Aleksey Midenkov for the patch! --- CMakeLists.txt | 6 ++++++ tdelibs.pc.cmake | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 tdelibs.pc.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 217668c9d..47d5b258b 100644 --- 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 ) diff --git a/tdelibs.pc.cmake b/tdelibs.pc.cmake new file mode 100644 index 000000000..2136f2b87 --- /dev/null +++ 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 From 20cb25189f9f0df72d1210344adf9f7cb60c3295 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 6 Mar 2012 11:46:29 -0600 Subject: [PATCH 3/3] Reset submodule main/tdelibs/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index ea715e15e..6868254e6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ea715e15edb3f6b9e78d631d75e18bb9dbace497 +Subproject commit 6868254e6c10ba5b95ef622b25c39144f3d1161a