From 72c061674b36c4eaa6882a3fc1f5a711e73c08e4 Mon Sep 17 00:00:00 2001 From: Niko Sams Date: Wed, 22 Dec 2010 18:03:15 +0000 Subject: [PATCH] move cmake modules into repo where they are used svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1208652 --- CMakeLists.txt | 23 ++++++++++++++++++++++- kdeeduui/CMakeLists.txt | 2 +- keduvocdocument/CMakeLists.txt | 4 +++- keduvocdocument/tests/CMakeLists.txt | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 340cc17..5ce93f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,31 @@ -project(libkdeedu) +project(LibKdeEdu) #add_definitions( -Wall -fprofile-arcs -ftest-coverage ) +find_package(KDE4 REQUIRED) +include(KDE4Defaults) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) + add_subdirectory(keduvocdocument) add_subdirectory(kdeeduui) add_subdirectory(libscience) #add_subdirectory(widgets) add_subdirectory(qtmmlwidget) add_subdirectory(icons) + + +configure_file( "${LibKdeEdu_SOURCE_DIR}/LibKdeEduConfig.cmake.in" "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake" @ONLY ) + +if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) + set(_LibKdeEdu_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/libkdeedu") +else(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) + set(_LibKdeEdu_CONFIG_DEST "${LIB_INSTALL_DIR}/libkdeedu") +endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) + +install( FILES + "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake" + DESTINATION "${_LibKdeEdu_CONFIG_DEST}" ) +install( EXPORT LibKdeEduTargets + DESTINATION "${_LibKdeEdu_CONFIG_DEST}" + NAMESPACE LibKdeEduImport__ + FILE LibKdeEduTargets.cmake ) diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt index 3cffd82..1b940f2 100644 --- a/kdeeduui/CMakeLists.txt +++ b/kdeeduui/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_library(kdeeduui SHARED ${kdeeduui_LIB_SRCS}) target_link_libraries(kdeeduui ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY}) set_target_properties(kdeeduui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS kdeeduui ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeeduui EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt index df9c5d7..97ead8c 100644 --- a/keduvocdocument/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@ -46,7 +46,7 @@ set_target_properties(keduvocdocument # SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION} #) -install(TARGETS keduvocdocument ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS keduvocdocument EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### @@ -68,5 +68,7 @@ install(FILES keduvocwordtype.h keduvocpersonalpronoun.h sharedkvtmlfiles.h + keduvocdeclension.h + keduvockvtml2writer.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu COMPONENT Devel ) diff --git a/keduvocdocument/tests/CMakeLists.txt b/keduvocdocument/tests/CMakeLists.txt index da4064f..f05b787 100644 --- a/keduvocdocument/tests/CMakeLists.txt +++ b/keduvocdocument/tests/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(keduvocdocumentvalidatortest keduvocdocument # CONVERTER: -include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ ) +include_directories( .. ) ########### next target ############### -- 2.47.3