telepathy-qt: cmake: do not duplicate install() lines for different components

[Alexandr Akulich]

Module: telepathy-qt
Branch: master
Commit: 1b2078bf6ba22bc72069e650addb05d9dd02627e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=1b2078bf6ba22bc72069e650addb05d9dd02627e

Author: George Kiagiadakis <gkiagia at tolabaki.gr>
Date:   Thu Jun 23 17:41:52 2016 +0300

cmake: do not duplicate install() lines for different components

cmake has no problem passing both RUNTIME and LIBRARY components
in a library install target. On DLL systems, RUNTIME will be used
and on non-DLL systems, LIBRARY will be used. This avoids the
check on our side.

---

 TelepathyQt/CMakeLists.txt           | 36 ++++++++++++------------------------
 TelepathyQt/Farstream/CMakeLists.txt | 18 ++++++------------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
index d879de9..eae0554 100644
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -800,18 +800,12 @@ set_target_properties(telepathy-qt${QT_VERSION_MAJOR} PROPERTIES
 install(FILES ${telepathy_qt_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt COMPONENT headers)
 install(FILES ${telepathy_qt_gen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/_gen COMPONENT headers)
 
-# Install the library - watch out for the correct components
-if (WIN32)
-    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}
-            EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-            RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
-            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libs)
-else ()
-    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}
-            EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-            LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
-            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libs)
-endif ()
+# Install the library
+install(TARGETS telepathy-qt${QT_VERSION_MAJOR}
+        EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
+        RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
+        ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libs)
 
 # pkg-config files, only if we are not using windows
 if (NOT WIN32)
@@ -995,18 +989,12 @@ if(ENABLE_SERVICE_SUPPORT)
                                                  SOVERSION ${TP_QT_SERVICE_ABI_VERSION}
                                                  VERSION ${TP_QT_LIBRARY_VERSION})
 
-    # Install the library - watch out for the correct components
-    if (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-service
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT service_libs)
-    else ()
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-service
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT service_libs)
-    endif ()
+    # Install the library
+    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-service
+            EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
+            RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
+            LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
+            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT service_libs)
 
     # Install headers
     install(FILES ${telepathy_qt_service_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt
diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
index d8582d9..3fa7207 100644
--- a/TelepathyQt/Farstream/CMakeLists.txt
+++ b/TelepathyQt/Farstream/CMakeLists.txt
@@ -57,18 +57,12 @@ if(FARSTREAM_COMPONENTS_FOUND)
                                                        SOVERSION ${TP_QT_ABI_VERSION}
                                                        VERSION ${TP_QT_LIBRARY_VERSION})
 
-    # Install the library - watch out for the correct components
-    if (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farstream
-                EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
-                RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream_libs)
-    else ()
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farstream
-                EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream_libs)
-    endif ()
+    # Install the library
+    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farstream
+            EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
+            RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
+            LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
+            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream_libs)
 
     # Install headers
     install(FILES ${telepathy_qt_farstream_HEADERS}