From ab8f449e149e9fbd7ad9135295f3e4a72687ede3 Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Fri, 8 Nov 2019 22:56:26 +0300 Subject: Examples: Port to targets --- examples/accounts/CMakeLists.txt | 12 ++++++------ examples/cm/CMakeLists.txt | 8 ++++---- examples/contact-messenger/CMakeLists.txt | 6 +++--- examples/extensions/CMakeLists.txt | 6 +++--- examples/file-transfer/CMakeLists.txt | 12 ++++++------ examples/protocols/CMakeLists.txt | 6 +++--- examples/roster/CMakeLists.txt | 22 +++++++++++----------- examples/stream-tubes/CMakeLists.txt | 20 ++++++++------------ 8 files changed, 44 insertions(+), 48 deletions(-) diff --git a/examples/accounts/CMakeLists.txt b/examples/accounts/CMakeLists.txt index aeebfc28..fc4bbfc5 100644 --- a/examples/accounts/CMakeLists.txt +++ b/examples/accounts/CMakeLists.txt @@ -11,12 +11,12 @@ set(accounts_MOC_SRCS tpqt_generate_mocs(${accounts_MOC_SRCS}) -find_package(Qt5 5.6 COMPONENTS Core Gui Widgets REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Widgets) add_executable(accounts ${accounts_SRCS} ${accounts_MOC_SRCS}) target_link_libraries(accounts - Qt5::Core - Qt5::Gui - Qt5::Widgets - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::Widgets + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/cm/CMakeLists.txt b/examples/cm/CMakeLists.txt index 381427b4..1fe030ec 100644 --- a/examples/cm/CMakeLists.txt +++ b/examples/cm/CMakeLists.txt @@ -11,8 +11,8 @@ if(ENABLE_SERVICE_SUPPORT) add_executable(cm ${cm_SRCS} ${cm_MOC_SRCS}) target_link_libraries(cm - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - telepathy-qt${QT_VERSION_MAJOR}-service - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Service + ) endif() diff --git a/examples/contact-messenger/CMakeLists.txt b/examples/contact-messenger/CMakeLists.txt index 3d6f4b12..6a856c3e 100644 --- a/examples/contact-messenger/CMakeLists.txt +++ b/examples/contact-messenger/CMakeLists.txt @@ -8,6 +8,6 @@ tpqt_generate_mocs(${messenger-sender_MOC_SRCS}) add_executable(messenger-sender ${messenger-sender_SRCS} ${messenger-sender_MOC_SRCS}) target_link_libraries(messenger-sender - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/extensions/CMakeLists.txt b/examples/extensions/CMakeLists.txt index 40767d09..fa5df1d6 100644 --- a/examples/extensions/CMakeLists.txt +++ b/examples/extensions/CMakeLists.txt @@ -71,6 +71,6 @@ list(APPEND example_extensions_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connect add_library(example_extensions STATIC ${example_extensions_SRCS}) add_dependencies(example_extensions example-extensions-connection-generation) target_link_libraries(example_extensions - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_LIBRARY_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/file-transfer/CMakeLists.txt b/examples/file-transfer/CMakeLists.txt index 5296588d..4b6d8595 100644 --- a/examples/file-transfer/CMakeLists.txt +++ b/examples/file-transfer/CMakeLists.txt @@ -14,9 +14,9 @@ tpqt_generate_mocs(${ft-receiver_MOC_SRCS}) add_executable(ft-receiver ${ft-receiver_SRCS} ${ft-receiver_MOC_SRCS}) target_link_libraries(ft-receiver - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core +) set(ft-sender_SRCS file-sender.cpp @@ -32,6 +32,6 @@ tpqt_generate_mocs(${ft-sender_MOC_SRCS}) add_executable(ft-sender ${ft-sender_SRCS} ${ft-sender_MOC_SRCS}) target_link_libraries(ft-sender - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/protocols/CMakeLists.txt b/examples/protocols/CMakeLists.txt index cd7b5917..1ef1d479 100644 --- a/examples/protocols/CMakeLists.txt +++ b/examples/protocols/CMakeLists.txt @@ -11,6 +11,6 @@ tpqt_generate_mocs(${protocols_MOC_SRCS}) add_executable(protocols ${protocols_SRCS} ${protocols_MOC_SRCS}) target_link_libraries(protocols - Qt5::Core - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/roster/CMakeLists.txt b/examples/roster/CMakeLists.txt index a1add36a..6daa1768 100644 --- a/examples/roster/CMakeLists.txt +++ b/examples/roster/CMakeLists.txt @@ -11,15 +11,15 @@ set(roster_MOC_SRCS tpqt_generate_mocs(${roster_MOC_SRCS}) -find_package(Qt5 5.6 COMPONENTS Core Gui Widgets REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Widgets) add_executable(roster ${roster_SRCS} ${roster_MOC_SRCS}) target_link_libraries(roster - Qt5::Core - Qt5::Gui - Qt5::Widgets - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::Widgets + TelepathyQt${QT_VERSION_MAJOR}::Core +) set(telepathy_qt_examples_roster_SRCS roster-item.cpp @@ -29,8 +29,8 @@ set(telepathy_qt_examples_roster_SRCS add_library(telepathy-qt-examples-roster ${telepathy_qt_examples_roster_SRCS}) target_link_libraries(telepathy-qt-examples-roster - Qt5::Core - Qt5::Gui - Qt5::Widgets - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_LIBRARY_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Gui + Qt${QT_VERSION_MAJOR}::Widgets + TelepathyQt${QT_VERSION_MAJOR}::Core +) diff --git a/examples/stream-tubes/CMakeLists.txt b/examples/stream-tubes/CMakeLists.txt index 233a7fe1..99c4206b 100644 --- a/examples/stream-tubes/CMakeLists.txt +++ b/examples/stream-tubes/CMakeLists.txt @@ -8,12 +8,10 @@ tpqt_generate_mocs(${tubereceiver_MOC_SRCS}) add_executable(tubereceiver ${tubereceiver_SRCS} ${tubereceiver_MOC_SRCS}) target_link_libraries(tubereceiver - ${QT_QTCORE_LIBRARY} - ${QT_QTDBUS_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTXML_LIBRARY} - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Network + TelepathyQt${QT_VERSION_MAJOR}::Core +) set(tubeinitiator_SRCS tube-initiator.cpp) @@ -25,9 +23,7 @@ tpqt_generate_mocs(${tubeinitiator_MOC_SRCS}) add_executable(tubeinitiator ${tubeinitiator_SRCS} ${tubeinitiator_MOC_SRCS}) target_link_libraries(tubeinitiator - ${QT_QTDBUS_LIBRARY} - ${QT_QTGUI_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTXML_LIBRARY} - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_EXECUTABLE_LINKER_FLAGS}) + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Network + TelepathyQt${QT_VERSION_MAJOR}::Core +) -- cgit v1.2.3