| 1 |
reavertm 11/09/30 21:41:27 |
| 2 |
|
| 3 |
Added: kadu-0.10.0-sdk-cmake.patch |
| 4 |
Log: |
| 5 |
Update deps, bug 385009, by Bartosz Brachaczek. Favor media-libs/phonon over outdated x11-libs/qt-phonon. Add sdk USE flag. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/kadu/files/kadu-0.10.0-sdk-cmake.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kadu-0.10.0-sdk-cmake.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN kadu-0.10.0/cmake/FindKadu.cmake new/cmake/FindKadu.cmake |
| 18 |
--- kadu-0.10.0/cmake/FindKadu.cmake 2011-08-24 08:43:41.000000000 +0200 |
| 19 |
+++ new/cmake/FindKadu.cmake 2011-09-30 23:26:39.043004993 +0200 |
| 20 |
@@ -133,10 +133,12 @@ |
| 21 |
set (KADU_PLUGINS_DIR ${KADU_DATA_DIR}/plugins) |
| 22 |
|
| 23 |
macro (kadu_api_directories INCLUDE_DIR) |
| 24 |
- foreach (ARG ${ARGN}) |
| 25 |
- file (GLOB API_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${ARG}/*.h) |
| 26 |
- install (FILES ${API_HEADERS} DESTINATION ${KADU_INSTALL_INCLUDE_DIR}/kadu/${INCLUDE_DIR}/${ARG}) |
| 27 |
- endforeach (ARG) |
| 28 |
+ if (INSTALL_SDK) |
| 29 |
+ foreach (ARG ${ARGN}) |
| 30 |
+ file (GLOB API_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${ARG}/*.h) |
| 31 |
+ install (FILES ${API_HEADERS} DESTINATION ${KADU_INSTALL_INCLUDE_DIR}/kadu/${INCLUDE_DIR}/${ARG}) |
| 32 |
+ endforeach (ARG) |
| 33 |
+ endif (INSTALL_SDK) |
| 34 |
endmacro (kadu_api_directories) |
| 35 |
|
| 36 |
macro (kadu_configuration) |
| 37 |
diff -ruN kadu-0.10.0/CMakeLists.txt new/CMakeLists.txt |
| 38 |
--- kadu-0.10.0/CMakeLists.txt 2011-08-24 08:43:41.000000000 +0200 |
| 39 |
+++ new/CMakeLists.txt 2011-09-30 23:28:24.979005031 +0200 |
| 40 |
@@ -7,7 +7,7 @@ |
| 41 |
option (BUILD_PLUGINS "Switch to Off if you do not want to build plugins" ON) |
| 42 |
|
| 43 |
# configuration |
| 44 |
-option (INSTALL_CMAKE_MODULE "Install cmake modules" ON) |
| 45 |
+option (INSTALL_SDK "Install SDK (API headers, cmake modules)" ON) |
| 46 |
if (UNIX) |
| 47 |
option (SIG_HANDLING_ENABLED "Define if you want system signals handling" ON) |
| 48 |
if (UNIX AND NOT APPLE) |
| 49 |
@@ -105,11 +105,11 @@ |
| 50 |
include (cmake/FindKadu.cmake) |
| 51 |
include_directories (${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/kadu-core ${QT_INCLUDES}) |
| 52 |
|
| 53 |
-if (INSTALL_CMAKE_MODULE) |
| 54 |
+if (INSTALL_SDK) |
| 55 |
install (FILES cmake/FindKadu.cmake DESTINATION ${KADU_CMAKE_MODULES_DIR}) |
| 56 |
install (PROGRAMS translations/plugintsupdate.sh DESTINATION ${KADU_PLUGINS_DIR}/sdk) |
| 57 |
install (FILES translations/configuration-ui.xsl DESTINATION ${KADU_PLUGINS_DIR}/sdk) |
| 58 |
-endif (INSTALL_CMAKE_MODULE) |
| 59 |
+endif (INSTALL_SDK) |
| 60 |
|
| 61 |
# build |
| 62 |
configure_file (${CMAKE_SOURCE_DIR}/kadu-config.h.cmake ${CMAKE_BINARY_DIR}/kadu-config.h) |
Archives