From ce308d94a29eecaf7b7cd03e14439dce7be6a98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 8 Dec 2021 12:57:10 +0100 Subject: CMake: Simplify pingpong/complexpingpong examples Change-Id: Iff9bf22c7aebc6a5f61cd7411a99ee2bbb11c12c Reviewed-by: Joerg Bornemann --- examples/dbus/complexpingpong/CMakeLists.txt | 52 ++++++---------------------- 1 file changed, 11 insertions(+), 41 deletions(-) (limited to 'examples/dbus/complexpingpong/CMakeLists.txt') diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt index da3e39a9bb..13c6d66850 100644 --- a/examples/dbus/complexpingpong/CMakeLists.txt +++ b/examples/dbus/complexpingpong/CMakeLists.txt @@ -1,7 +1,5 @@ -# Generated from complexpingpong.pro. - cmake_minimum_required(VERSION 3.16) -project(complexping LANGUAGES CXX) +project(complexpingpong LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -10,61 +8,33 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong") -find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Core DBus) qt_add_executable(complexping complexping.cpp complexping.h ping-common.h ) -set_target_properties(complexping PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(complexping PUBLIC - # Remove: gui - Qt::DBus -) -install(TARGETS complexping - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +target_link_libraries(complexping PRIVATE + Qt6::Core + Qt6::DBus ) -cmake_minimum_required(VERSION 3.16) -project(complexpong LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong") - -find_package(Qt6 COMPONENTS DBus) qt_add_executable(complexpong complexpong.cpp complexpong.h ) -set_target_properties(complexpong PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(complexpong PUBLIC - # Remove: gui - Qt::DBus + +target_link_libraries(complexpong PRIVATE + Qt6::Core + Qt6::DBus ) -install(TARGETS complexpong +install(TARGETS complexping complexpong RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3