diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-25 11:48:16 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-06 00:31:54 +0100 |
| commit | c9725f02799a72950ad4f6b38cef57d492fc81bc (patch) | |
| tree | 192faad999dec1a40aa888056dcfb3f6ff5dcafd | |
| parent | 7ad4f9db2700db57352fae98631bade347567ebd (diff) | |
| download | qtsvg-c9725f02799a72950ad4f6b38cef57d492fc81bc.tar.gz | |
CMake: Regenerate some of projects to be up-to-date
Change-Id: I7d490ab372a169de653f6be9702123ddd647c04c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/plugins/iconengines/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
6 files changed, 26 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index acf82c0..f1b6e3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1,6 @@ -add_subdirectory(svg) -add_subdirectory(plugins) +# Generated from src.pro. + +if(TARGET Qt::Gui) + add_subdirectory(svg) + add_subdirectory(plugins) +endif() diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index ca95765..4a8ccf9 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,2 +1,6 @@ +# Generated from plugins.pro. + add_subdirectory(iconengines) -add_subdirectory(imageformats) +if(QT_FEATURE_imageformatplugin) + add_subdirectory(imageformats) +endif() diff --git a/src/plugins/iconengines/CMakeLists.txt b/src/plugins/iconengines/CMakeLists.txt index 6a2b160..f2491a0 100644 --- a/src/plugins/iconengines/CMakeLists.txt +++ b/src/plugins/iconengines/CMakeLists.txt @@ -1 +1,3 @@ +# Generated from iconengines.pro. + add_subdirectory(svgiconengine) diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt index d0c989a..4336bbf 100644 --- a/src/plugins/imageformats/CMakeLists.txt +++ b/src/plugins/imageformats/CMakeLists.txt @@ -1 +1,3 @@ +# Generated from imageformats.pro. + add_subdirectory(svg) diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67abeef..ce4dc49 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,8 @@ -# special case begin +# Generated from tests.pro. + if(QT_BUILD_STANDALONE_TESTS) - qt_find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test) - qt_find_package(Qt6 COMPONENTS Svg Widgets Xml) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() -# special case end qt_build_tests() |