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
19 years ago · d3619da584
parent d94f0e507e
commit d3619da584
3 changed files with 3 additions and 6 deletions
--- 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
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@ -1,2 +0,0 @@
-install(FILES okular.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@ -1,2 +0,0 @@
-install( FILES okularGenerator.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
-
				`@ -1,2 +0,0 @@`
				`install(FILES okular.kcfg DESTINATION ${KCFG_INSTALL_DIR})`
				`@ -1,2 +0,0 @@`
				`install( FILES okularGenerator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )`