From: Patrick Spendrin Date: Thu, 8 Nov 2007 22:06:59 +0000 (+0000) Subject: Reverted changes made earlier today - and I added the workaround in the root file... X-Git-Tag: v3.96.0~3 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=31804aae9b422a64de76f6cf5c440604de567000;p=libqmvoc.git Reverted changes made earlier today - and I added the workaround in the root file as described in kde-buildsystem - please tell me again if this should go somewhere else 2/3 svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=734448 --- diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt index e147dd9..9b76ae7 100644 --- 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 bc97194..f602766 100644 --- 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 e5c42a6..bcbe6ce 100644 --- 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 3284083..e1ce59a 100644 --- 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})