Reverted changes made earlier today - and I added the workaround in the root file...

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=734448

diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt
index e147dd9412ebc84e8ff39c37b8f92e19e4484584..9b76ae740a18b5b915c68b5b12245ba3c8445e90 100644 (file)
--- a/extdate/CMakeLists.txt
+++ b/extdate/CMakeLists.txt
@@ -22,10 +22,6 @@ kde4_add_library(extdate SHARED ${extdate_LIB_SRCS})
 target_link_libraries(extdate  ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY})
 
 set_target_properties(extdate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS extdate 
-        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS extdate  DESTINATION ${LIB_INSTALL_DIR})
 
 

diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt
index bc97194b4fce705c991606f2bdac35902e7ff2cd..f602766a5bf8f4281d1d1497e2bd05f70a2b3456 100644 (file)
--- a/kdeeduui/CMakeLists.txt
+++ b/kdeeduui/CMakeLists.txt
@@ -14,11 +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
-        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kdeeduui  DESTINATION ${LIB_INSTALL_DIR})
 
 
 ########### install files ###############

diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt
index e5c42a680c95edf36678fcc98ef6f578875c8c0a..bcbe6ce806cfa44d6a41a12886bd219df4c64b8f 100644 (file)
--- a/keduvocdocument/CMakeLists.txt
+++ b/keduvocdocument/CMakeLists.txt
@@ -33,11 +33,7 @@ kde4_add_library(keduvocdocument SHARED ${keduvocdocument_LIB_SRCS})
 target_link_libraries(keduvocdocument  ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
 
 set_target_properties(keduvocdocument PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS keduvocdocument 
-        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS keduvocdocument  DESTINATION ${LIB_INSTALL_DIR})
 
 
 ########### install files ###############

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 32840838d8b2ebfbaf609eeee0e09cf28cd6f447..e1ce59a0d1a1edc1e649e003ebc7f8b62592da52 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -20,9 +20,5 @@ kde4_add_library(science SHARED ${science_LIB_SRCS})
 target_link_libraries(science  ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} )
 
 set_target_properties(science PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS science 
-        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS science  DESTINATION ${LIB_INSTALL_DIR})