1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Simplify pingpong/complexpingpong examples

Browse Source 
Change-Id: Iff9bf22c7aebc6a5f61cd7411a99ee2bbb11c12c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne 2021-12-08 12:57:10 +01:00
parent f6cbb1ae70
commit ce308d94a2
2 changed files with 22 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
examples/dbus/complexpingpong/CMakeLists.txt
View File

@ -1,7 +1,5 @@
# Generated from complexpingpong.pro.
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(complexping LANGUAGES CXX) project(complexpingpong LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -15,56 +13,28 @@ endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong") set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong")
find_package(Qt6 COMPONENTS DBus) find_package(Qt6 COMPONENTS Core DBus)
qt_add_executable(complexping qt_add_executable(complexping
complexping.cpp complexping.h complexping.cpp complexping.h
ping-common.h ping-common.h
) )
set_target_properties(complexping PROPERTIES
WIN32_EXECUTABLE TRUE target_link_libraries(complexping PRIVATE
MACOSX_BUNDLE TRUE Qt6::Core
Qt6::DBus
) )
target_link_libraries(complexping PUBLIC
# Remove: gui
Qt::DBus
)
install(TARGETS complexping
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
)
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 qt_add_executable(complexpong
complexpong.cpp complexpong.h complexpong.cpp complexpong.h
) )
set_target_properties(complexpong PROPERTIES
WIN32_EXECUTABLE TRUE target_link_libraries(complexpong PRIVATE
MACOSX_BUNDLE TRUE Qt6::Core
) Qt6::DBus
target_link_libraries(complexpong PUBLIC
# Remove: gui
Qt::DBus
) )
install(TARGETS complexpong install(TARGETS complexping complexpong
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"

48
examples/dbus/pingpong/CMakeLists.txt
View File

@ -1,7 +1,5 @@
# Generated from pingpong.pro.
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(ping LANGUAGES CXX) project(pingpong LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -15,57 +13,29 @@ endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/pingpong") set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/pingpong")
find_package(Qt6 COMPONENTS DBus) find_package(Qt6 COMPONENTS Core DBus)
qt_add_executable(ping qt_add_executable(ping
ping.cpp ping.cpp
ping-common.h ping-common.h
) )
set_target_properties(ping PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(ping PUBLIC target_link_libraries(ping PUBLIC
# Remove: gui Qt6::Core
Qt::DBus Qt6::DBus
) )
install(TARGETS ping
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
)
cmake_minimum_required(VERSION 3.16)
project(pong 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/pingpong")
find_package(Qt6 COMPONENTS DBus)
qt_add_executable(pong qt_add_executable(pong
ping-common.h ping-common.h
pong.cpp pong.h pong.cpp pong.h
) )
set_target_properties(pong PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_link_libraries(pong PUBLIC target_link_libraries(pong PUBLIC
# Remove: gui Qt6::Core
Qt::DBus Qt6::DBus
) )
install(TARGETS pong install(TARGETS ping pong
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"