From 0868c983f19fc61c76bf0294f8c5daecc305104b Mon Sep 17 00:00:00 2001 From: Niko Sams Date: Wed, 22 Dec 2010 18:08:45 +0000 Subject: [PATCH] revert previous commit this has to be reviewed first (I wanted to commit to my local git and missplaced git with svn, sorry) svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1208653 --- CMakeLists.txt | 23 +---------------------- kdeeduui/CMakeLists.txt | 2 +- keduvocdocument/CMakeLists.txt | 4 +--- keduvocdocument/tests/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce93f4..340cc17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,31 +1,10 @@ -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 1b940f2..3cffd82 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 EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeeduui ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt index 97ead8c..df9c5d7 100644 --- a/keduvocdocument/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@ -46,7 +46,7 @@ set_target_properties(keduvocdocument # SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION} #) -install(TARGETS keduvocdocument EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS keduvocdocument ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### @@ -68,7 +68,5 @@ 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 f05b787..da4064f 100644 --- a/keduvocdocument/tests/CMakeLists.txt +++ b/keduvocdocument/tests/CMakeLists.txt @@ -9,7 +9,7 @@ target_link_libraries(keduvocdocumentvalidatortest keduvocdocument # CONVERTER: -include_directories( .. ) +include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ ) ########### next target ############### -- 2.47.3