[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e07bb3e
The following commit has been merged in the master branch:
commit e07bb3e6af2979fafbf0d7dac3935bcc9d196eb9
Author: George Goldberg <grundleborg at googlemail.com>
Date: Thu Feb 11 21:22:54 2010 +0000
Tidy up buildsystem.
svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088893
---
kpeople/nepomuk-feeder/CMakeLists.txt | 179 +++++++++++++--------
.../cmake/modules/FindTelepathyQt4.cmake | 2 +-
kpeople/nepomuk-feeder/nie/CMakeLists.txt | 35 ++--
3 files changed, 133 insertions(+), 83 deletions(-)
diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index 7f73224..a6cf5df 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -1,89 +1,128 @@
-project(telepathy_integration_daemon)
+project (telepathy_integration_daemon)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+# Include our extra FindFoo.cmake files.
+set (CMAKE_MODULE_PATH
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+ ${CMAKE_MODULE_PATH}
+)
-# search packages used by KDE
find_package (KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
-include(CheckIncludeFiles)
-include(NepomukAddOntologyClasses)
-
+find_package (Nepomuk REQUIRED)
find_package (TelepathyQt4 REQUIRED)
-find_package(Nepomuk REQUIRED)
-
-# find the pimo.trig file from the kdebase installation
-find_file(PIMO_TRIG_SOURCE
- pimo.trig
- PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" ENV XDG_DATA_DIRS
- PATH_SUFFIXES "nepomuk/ontologies"
- )
-
-if(NOT PIMO_TRIG_SOURCE)
- message(ERROR_FATAL "Could not find pimo.trig PIMO source file. Is kdebase-runtime installed?")
-endif(NOT PIMO_TRIG_SOURCE)
-
-# find the nco.trig file from the kdebase installation
-find_file(NCO_TRIG_SOURCE
- nco.trig
- PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" ENV XDG_DATA_DIRS
- PATH_SUFFIXES "nepomuk/ontologies"
- )
-
-if(NOT NCO_TRIG_SOURCE)
- message(ERROR_FATAL "Could not find nco.trig NCO source file. Is kdebase-runtime installed?")
-endif(NOT NCO_TRIG_SOURCE)
-
-if(WIN32)
- set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
-endif(WIN32)
-
-set(KDE4_ICON_DIR ${KDE4_INSTALL_DIR}/share/icons)
-
-include_directories(
- ${KDE4_INCLUDES}
- ${KDEPIMLIBS_INCLUDE_DIRS}
- ${TELEPATHY_QT4_INCLUDE_DIR}
- ${NEPOMUK_INCLUDES}
- ${CMAKE_CURRENT_BINARY_DIR}/nie
+
+include (CheckIncludeFiles)
+include (KDE4Defaults)
+include (MacroLibrary)
+include (MacroOptionalAddSubdirectory)
+include (NepomukAddOntologyClasses)
+
+# Find pimo.trig, which is installed already by kdebase.
+find_file (PIMO_TRIG_SOURCE
+ pimo.trig
+ PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
+ ENV XDG_DATA_DIRS
+ PATH_SUFFIXES "ontology/pimo"
+)
+
+# We depend on pimo.trig, so fail horribly if it's not found.
+if (NOT PIMO_TRIG_SOURCE)
+ message (ERROR_FATAL
+ "Could not find pimo.trig PIMO source file. Is kdebase-runtime installed?"
+ )
+endif (NOT PIMO_TRIG_SOURCE)
+
+# Find nco.trig, which is installed already by kdebase.
+find_file (NCO_TRIG_SOURCE
+ nco.trig
+ PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
+ ENV XDG_DATA_DIRS
+ PATH_SUFFIXES "ontology/nie"
)
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+# We depend on nco.trig, so fail horribly if it's not found.
+if (NOT NCO_TRIG_SOURCE)
+ message (ERROR_FATAL
+ "Could not find nco.trig NCO source file. Is kdebase-runtime installed?"
+ )
+endif (NOT NCO_TRIG_SOURCE)
+
+# Some magic win32 stuff. FIXME: What does this do?
+if (WIN32)
+ set (LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ )
+endif (WIN32)
+
+set (KDE4_ICON_DIR
+ ${KDE4_INSTALL_DIR}/share/icons
+)
+include_directories (${KDE4_INCLUDES}
+ ${KDEPIMLIBS_INCLUDE_DIRS}
+ ${TELEPATHY_QT4_INCLUDE_DIR}
+ ${NEPOMUK_INCLUDES}
+ ${CMAKE_CURRENT_BINARY_DIR}/nie
+)
+set (CMAKE_CXX_FLAGS
+ "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}"
+)
-add_subdirectory(nie)
-########### next target ###############
+# Build-system setup is now complete. Add any subdirectories we want to build too.
+add_subdirectory (nie)
-set(telepathy_integration_daemon_SRCS
- telepathyaccountmonitor.cpp
- telepathyaccount.cpp
- main.cpp
+##### Main build target. #####
+
+set (telepathy_integration_daemon_SRCS
+ telepathyaccountmonitor.cpp
+ telepathyaccount.cpp
+ main.cpp
+)
+
+# Add the ontologys we want to build the vocabulary for.
+soprano_add_ontology (pimo_SRCS
+ ${PIMO_TRIG_SOURCE}
+ "PIMO"
+ "Nepomuk::Vocabulary"
+ "trig"
)
-soprano_add_ontology(pimo_SRCS ${PIMO_TRIG_SOURCE} "PIMO" "Nepomuk::Vocabulary" "trig")
-soprano_add_ontology(nco_SRCS ${NCO_TRIG_SOURCE} "NCO" "Nepomuk::Vocabulary" "trig")
-soprano_add_ontology(telepathy_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/telepathy.trig "Telepathy" "Nepomuk::Vocabulary" "trig")
+soprano_add_ontology (nco_SRCS
+ ${NCO_TRIG_SOURCE}
+ "NCO"
+ "Nepomuk::Vocabulary"
+ "trig"
+)
+soprano_add_ontology (telepathy_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/telepathy.trig
+ "Telepathy"
+ "Nepomuk::Vocabulary"
+ "trig"
+)
+
+# Build the daemon.
+kde4_add_executable (telepathy-integration-daemon
+ ${telepathy_integration_daemon_SRCS}
+ ${pimo_SRCS}
+ ${nco_SRCS}
+ ${telepathy_SRCS}
+)
-kde4_add_executable(telepathy-integration-daemon ${telepathy_integration_daemon_SRCS}
- ${pimo_SRCS}
- ${nco_SRCS}
- ${telepathy_SRCS}
- ${telepathy_full_SRCS}
+target_link_libraries (telepathy-integration-daemon
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTDBUS_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+ ${TELEPATHY_QT4_LIBRARIES}
+ ${NEPOMUK_LIBRARIES}
+ nie
)
-target_link_libraries(telepathy-integration-daemon ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
- ${NEPOMUK_LIBRARIES}
- nie
+# Install the daemon.
+install (TARGETS telepathy-integration-daemon
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
)
-install(TARGETS telepathy-integration-daemon ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake b/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
index ac22a4e..4bed08a 100644
--- a/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
+++ b/kpeople/nepomuk-feeder/cmake/modules/FindTelepathyQt4.cmake
@@ -17,7 +17,7 @@ endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.1.7)
+ pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.2.0)
endif(PKG_CONFIG_FOUND)
find_path(TELEPATHY_QT4_INCLUDE_DIR
diff --git a/kpeople/nepomuk-feeder/nie/CMakeLists.txt b/kpeople/nepomuk-feeder/nie/CMakeLists.txt
index 00f641c..66024b4 100644
--- a/kpeople/nepomuk-feeder/nie/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/nie/CMakeLists.txt
@@ -1,12 +1,23 @@
-include(NepomukAddOntologyClasses)
-NEPOMUK_ADD_ONTOLOGY_CLASSES(
- nie_SRCS
- ONTOLOGIES
- ${CMAKE_CURRENT_SOURCE_DIR}/nie.rdfs
- ${CMAKE_CURRENT_SOURCE_DIR}/nfo.rdfs
- ${CMAKE_CURRENT_SOURCE_DIR}/nco.rdfs
- ${CMAKE_CURRENT_SOURCE_DIR}/nmo.rdfs
- ${CMAKE_CURRENT_SOURCE_DIR}/../telepathy.trig
- )
-kde4_add_library(nie STATIC ${nie_SRCS})
-target_link_libraries(nie ${QT_QTCORE_LIBRARY} ${NEPOMUK_LIBRARIES})
+# Build a static library with the full ontology classes for the ontologies we need.
+
+include (NepomukAddOntologyClasses)
+
+nepomuk_add_ontology_classes (nie_SRCS
+ ONTOLOGIES
+ ${CMAKE_CURRENT_SOURCE_DIR}/nie.rdfs
+ ${CMAKE_CURRENT_SOURCE_DIR}/nfo.rdfs
+ ${CMAKE_CURRENT_SOURCE_DIR}/nco.rdfs
+ ${CMAKE_CURRENT_SOURCE_DIR}/nmo.rdfs
+ ${CMAKE_CURRENT_SOURCE_DIR}/../telepathy.trig
+)
+
+kde4_add_library (nie
+ STATIC
+ ${nie_SRCS}
+)
+
+target_link_libraries (nie
+ ${QT_QTCORE_LIBRARY}
+ ${NEPOMUK_LIBRARIES}
+)
+
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list