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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ce93f4c10e8b3a6e0cf2a2e25592e24962cb0d2..340cc1755076b85f0ae2c34e832bfddc9fa6320f 100644 (file)
--- 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 1b940f2b8130c0ff6fb0f4eb82554ba713105e60..3cffd82837eabc7af037c881713b5c602d86b367 100644 (file)
--- 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 97ead8ca4055adb7523e7f7adcf82c34e4cea48c..df9c5d7985902ce4d887a81adcd399bc71f4403b 100644 (file)
--- 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 f05b7874a0e5824a917b0b47abbca2e0e3708515..da4064f81daa5c68dc1eeeca88c80cd86d224538 100644 (file)
--- 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 ###############