diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-04 08:15:50 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-04 18:50:39 +0000 |
| commit | 76108058796bf0884f6fd128d81f1bc49f9a56af (patch) | |
| tree | 1c5f0740ca3217f3d11cf7c684143bbb0da0f336 /examples/qtconcurrent | |
| parent | 465949420a877099247d94dd4db54d19ca5a9a7c (diff) | |
Regenerate examples
Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/qtconcurrent')
| -rw-r--r-- | examples/qtconcurrent/imagescaling/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | examples/qtconcurrent/progressdialog/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/qtconcurrent/runfunction/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/qtconcurrent/wordcount/CMakeLists.txt | 6 |
6 files changed, 31 insertions, 8 deletions
diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt index 5d487ab409..8585ed89a0 100644 --- a/examples/qtconcurrent/imagescaling/CMakeLists.txt +++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/imagescaling") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) find_package(Qt6 COMPONENTS Widgets) @@ -20,6 +22,8 @@ add_qt_gui_executable(imagescaling ) target_link_libraries(imagescaling PUBLIC Qt::Concurrent + Qt::Core + Qt::Gui Qt::Widgets ) diff --git a/examples/qtconcurrent/map/.prev_CMakeLists.txt b/examples/qtconcurrent/map/.prev_CMakeLists.txt index cd53409ec8..8e158b2397 100644 --- a/examples/qtconcurrent/map/.prev_CMakeLists.txt +++ b/examples/qtconcurrent/map/.prev_CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) add_executable(mapdemo @@ -18,9 +20,12 @@ add_executable(mapdemo ) target_link_libraries(mapdemo PUBLIC Qt::Concurrent + Qt::Core + Qt::Gui ) install(TARGETS mapdemo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt index 1707825b8f..e5a3ba1c66 100644 --- a/examples/qtconcurrent/map/CMakeLists.txt +++ b/examples/qtconcurrent/map/CMakeLists.txt @@ -9,17 +9,19 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) -find_package(Qt6 COMPONENTS Gui) # special case add_executable(mapdemo main.cpp ) target_link_libraries(mapdemo PUBLIC Qt::Concurrent - Qt::Gui # special case + Qt::Core + Qt::Gui ) install(TARGETS mapdemo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/qtconcurrent/progressdialog/CMakeLists.txt b/examples/qtconcurrent/progressdialog/CMakeLists.txt index f9e7980b63..912490bd65 100644 --- a/examples/qtconcurrent/progressdialog/CMakeLists.txt +++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/progressdialog") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) find_package(Qt6 COMPONENTS Widgets) @@ -19,6 +21,8 @@ add_executable(progressdialog ) target_link_libraries(progressdialog PUBLIC Qt::Concurrent + Qt::Core + Qt::Gui Qt::Widgets ) diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt index de20553212..a8cb3de4d4 100644 --- a/examples/qtconcurrent/runfunction/CMakeLists.txt +++ b/examples/qtconcurrent/runfunction/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/runfunction") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) find_package(Qt6 COMPONENTS Widgets) @@ -19,6 +21,8 @@ add_executable(runfunction ) target_link_libraries(runfunction PUBLIC Qt::Concurrent + Qt::Core + Qt::Gui Qt::Widgets ) diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt index e4afbaa4c5..22d78c3877 100644 --- a/examples/qtconcurrent/wordcount/CMakeLists.txt +++ b/examples/qtconcurrent/wordcount/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/wordcount") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Concurrent) find_package(Qt6 COMPONENTS Widgets) @@ -19,6 +21,8 @@ add_executable(wordcount ) target_link_libraries(wordcount PUBLIC Qt::Concurrent + Qt::Core + Qt::Gui Qt::Widgets ) |