[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/decibel/cmake/modules
From: Eva Brucherseifer <eva () kde ! org>
Date: 2008-11-09 21:47:47
Message-ID: 1226267267.734375.20876.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 882139 by eva:
thanks to Alex Neundorf it should now be possible to compile decibel as port of \
kdesupport. It works on my system, it would be good if anyone else \
verifies.
CC: neundorf@kde.org, dominik.haumann@basyskom.de, decibel@kde.org
M +12 -4 FindTapiocaQt.cmake
M +12 -4 FindTelepathyQt.cmake
--- trunk/kdesupport/decibel/cmake/modules/FindTapiocaQt.cmake #882138:882139
@@ -14,14 +14,22 @@
set(TAPIOCA_QT_FIND_QUIETLY TRUE)
endif (TAPIOCA_QT_INCLUDE_DIR AND TAPIOCA_QT_LIBRARIES)
-find_path(TAPIOCA_QT_INCLUDE_DIR
+# Are we using this inside kdesupport ?
+# Then expect that QtTapioca is also part of kdesupport:
+if(KDESupport_SOURCE_DIR)
+ set(TAPIOCA_QT_INCLUDE_DIR ${KDESupport_SOURCE_DIR}/tapioca-qt/include)
+ set(TAPIOCA_QT_LIBRARIES QtTapioca)
+else(KDESupport_SOURCE_DIR)
+ # otherwise try to find it just like any other project:
+ find_path(TAPIOCA_QT_INCLUDE_DIR
NAMES QtTapioca/Channel QtTapioca/Connection
PATHS ${CMAKE_INSTALL_PREFIX}/include
-)
-find_library(TAPIOCA_QT_LIBRARIES
+ )
+ find_library(TAPIOCA_QT_LIBRARIES
NAMES QtTapioca
PATHS ${CMAKE_INSTALL_PREFIX}/lib
-)
+ )
+endif(KDESupport_SOURCE_DIR)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TAPIOCA_QT DEFAULT_MSG
--- trunk/kdesupport/decibel/cmake/modules/FindTelepathyQt.cmake #882138:882139
@@ -14,14 +14,22 @@
set(TELEPATHY_QT_FIND_QUIETLY TRUE)
endif (TELEPATHY_QT_INCLUDE_DIR AND TELEPATHY_QT_LIBRARIES)
-find_path(TELEPATHY_QT_INCLUDE_DIR
+# Are we using this inside kdesupport ?
+# Then expect that QtTapioca is also part of kdesupport:
+if(KDESupport_SOURCE_DIR)
+ set(TELEPATHY_QT_INCLUDE_DIR ${KDESupport_SOURCE_DIR}/telepathy-qt/include)
+ set(TELEPATHY_QT_LIBRARIES QtTelepathy)
+else(KDESupport_SOURCE_DIR)
+ # otherwise try to find it just like any other project:
+ find_path(TELEPATHY_QT_INCLUDE_DIR
NAMES QtTelepathy/Client/Channel QtTelepathy/Client/Connection
PATHS ${CMAKE_INSTALL_PREFIX}/include
-)
-find_library(TELEPATHY_QT_LIBRARIES
+ )
+ find_library(TELEPATHY_QT_LIBRARIES
NAMES QtTelepathyClient
PATHS ${CMAKE_INSTALL_PREFIX}/lib
-)
+ )
+endif(KDESupport_SOURCE_DIR)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TELEPATHY_QT DEFAULT_MSG
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic