From d3619da584c456defa5ceaec021fc31828ba3dcb Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 25 Jan 2007 18:06:53 +0000 Subject: [PATCH] get rid of two CMakeLists.txt's used to only install one files each - install the stuff from the top-level CMakeLists.txt svn path=/trunk/playground/graphics/okular/; revision=627106 --- CMakeLists.txt | 5 +++-- conf/CMakeLists.txt | 2 -- core/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 conf/CMakeLists.txt delete mode 100644 core/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a496dc277..eda07b7d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,6 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/config-okular.h ) -add_subdirectory( conf ) -add_subdirectory( core ) add_subdirectory( ui ) add_subdirectory( shell ) add_subdirectory( generators ) @@ -95,6 +93,9 @@ target_link_libraries(okularcore ${OKULAR_IOKIT} ${QT_QTCORE_LIBRARY} ${QT_QTGU install(TARGETS okularcore DESTINATION ${LIB_INSTALL_DIR} ) +install(FILES conf/okular.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES core/okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) + # okularpart set(okularpart_SRCS diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt deleted file mode 100644 index f72169fbf..000000000 --- a/conf/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -install(FILES okular.kcfg DESTINATION ${KCFG_INSTALL_DIR}) - diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt deleted file mode 100644 index c6dbd2027..000000000 --- a/core/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -install( FILES okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -