making all shared libraries go to their default place: this is /bin on windows -...

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

diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt
index e34c996ada39fb38594707494aedd339a977a9bb..e147dd9412ebc84e8ff39c37b8f92e19e4484584 100644 (file)
--- a/extdate/CMakeLists.txt
+++ b/extdate/CMakeLists.txt
@@ -22,6 +22,10 @@ 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  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS extdate 
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
 
 

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

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

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 13c6f19feda893b7a0400557b2ba1ca6f519b94e..32840838d8b2ebfbaf609eeee0e09cf28cd6f447 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -20,5 +20,9 @@ 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  DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS science 
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)