From fd9d3b4dceea639ecab345b4ee75a0ee12f5e480 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 17:30:48 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I045015a4f3b78f15570ea401d2b99ea1b75ec414 Reviewed-by: Joerg Bornemann --- tests/auto/dds/CMakeLists.txt | 4 ++-- tests/auto/heif/CMakeLists.txt | 4 ++-- tests/auto/icns/CMakeLists.txt | 4 ++-- tests/auto/jp2/CMakeLists.txt | 4 ++-- tests/auto/mng/CMakeLists.txt | 4 ++-- tests/auto/tga/CMakeLists.txt | 4 ++-- tests/auto/tiff/CMakeLists.txt | 4 ++-- tests/auto/wbmp/CMakeLists.txt | 4 ++-- tests/auto/webp/CMakeLists.txt | 4 ++-- tests/benchmarks/mng/CMakeLists.txt | 4 ++-- tests/benchmarks/tiff/CMakeLists.txt | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tests') diff --git a/tests/auto/dds/CMakeLists.txt b/tests/auto/dds/CMakeLists.txt index 6da7a9a..028f325 100644 --- a/tests/auto/dds/CMakeLists.txt +++ b/tests/auto/dds/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qdds Test: ##################################################################### -qt_add_test(tst_qdds +qt_internal_add_test(tst_qdds SOURCES tst_qdds.cpp PUBLIC_LIBRARIES @@ -215,7 +215,7 @@ set(dds_resource_files "dds/mipmaps.dds" ) -qt_add_resource(tst_qdds "dds" +qt_internal_add_resource(tst_qdds "dds" PREFIX "/" BASE diff --git a/tests/auto/heif/CMakeLists.txt b/tests/auto/heif/CMakeLists.txt index c4ca92d..1626731 100644 --- a/tests/auto/heif/CMakeLists.txt +++ b/tests/auto/heif/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qheif Test: ##################################################################### -qt_add_test(tst_qheif +qt_internal_add_test(tst_qheif SOURCES tst_qheif.cpp PUBLIC_LIBRARIES @@ -23,7 +23,7 @@ set(heif_resource_files "heif/newlogoCCW.heic" ) -qt_add_resource(tst_qheif "heif" +qt_internal_add_resource(tst_qheif "heif" PREFIX "/" BASE diff --git a/tests/auto/icns/CMakeLists.txt b/tests/auto/icns/CMakeLists.txt index c7d9806..c89f1c7 100644 --- a/tests/auto/icns/CMakeLists.txt +++ b/tests/auto/icns/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qicns Test: ##################################################################### -qt_add_test(tst_qicns +qt_internal_add_test(tst_qicns SOURCES tst_qicns.cpp PUBLIC_LIBRARIES @@ -63,7 +63,7 @@ set(icns_resource_files "icns/test-write-64.png" ) -qt_add_resource(tst_qicns "icns" +qt_internal_add_resource(tst_qicns "icns" PREFIX "/" BASE diff --git a/tests/auto/jp2/CMakeLists.txt b/tests/auto/jp2/CMakeLists.txt index 7b998e6..2b84769 100644 --- a/tests/auto/jp2/CMakeLists.txt +++ b/tests/auto/jp2/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qjp2 Test: ##################################################################### -qt_add_test(tst_qjp2 +qt_internal_add_test(tst_qjp2 SOURCES tst_qjp2.cpp PUBLIC_LIBRARIES @@ -23,7 +23,7 @@ set(jp2_resource_files "jp2/logo.jp2" ) -qt_add_resource(tst_qjp2 "jp2" +qt_internal_add_resource(tst_qjp2 "jp2" PREFIX "/" BASE diff --git a/tests/auto/mng/CMakeLists.txt b/tests/auto/mng/CMakeLists.txt index 56e53a8..a956899 100644 --- a/tests/auto/mng/CMakeLists.txt +++ b/tests/auto/mng/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qmng Test: ##################################################################### -qt_add_test(tst_qmng +qt_internal_add_test(tst_qmng SOURCES tst_qmng.cpp PUBLIC_LIBRARIES @@ -35,7 +35,7 @@ set(mng_resource_files "mng/fire.mng" ) -qt_add_resource(tst_qmng "mng" +qt_internal_add_resource(tst_qmng "mng" PREFIX "/" BASE diff --git a/tests/auto/tga/CMakeLists.txt b/tests/auto/tga/CMakeLists.txt index feed14d..d94d056 100644 --- a/tests/auto/tga/CMakeLists.txt +++ b/tests/auto/tga/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtga Test: ##################################################################### -qt_add_test(tst_qtga +qt_internal_add_test(tst_qtga SOURCES tst_qtga.cpp PUBLIC_LIBRARIES @@ -19,7 +19,7 @@ set(tga_resource_files "tga/test-flag.tga" ) -qt_add_resource(tst_qtga "tga" +qt_internal_add_resource(tst_qtga "tga" PREFIX "/" BASE diff --git a/tests/auto/tiff/CMakeLists.txt b/tests/auto/tiff/CMakeLists.txt index 4bd527a..1e9d221 100644 --- a/tests/auto/tiff/CMakeLists.txt +++ b/tests/auto/tiff/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtiff Test: ##################################################################### -qt_add_test(tst_qtiff +qt_internal_add_test(tst_qtiff SOURCES tst_qtiff.cpp PUBLIC_LIBRARIES @@ -239,7 +239,7 @@ set(tiff_resource_files "tiff/tiled_rgb.tiff" ) -qt_add_resource(tst_qtiff "tiff" +qt_internal_add_resource(tst_qtiff "tiff" PREFIX "/" BASE diff --git a/tests/auto/wbmp/CMakeLists.txt b/tests/auto/wbmp/CMakeLists.txt index 09d4cbd..6b73b20 100644 --- a/tests/auto/wbmp/CMakeLists.txt +++ b/tests/auto/wbmp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwbmp Test: ##################################################################### -qt_add_test(tst_qwbmp +qt_internal_add_test(tst_qwbmp SOURCES tst_qwbmp.cpp PUBLIC_LIBRARIES @@ -23,7 +23,7 @@ set(wbmp_resource_files "wbmp/qt-logo-small.wbmp" ) -qt_add_resource(tst_qwbmp "wbmp" +qt_internal_add_resource(tst_qwbmp "wbmp" PREFIX "/" BASE diff --git a/tests/auto/webp/CMakeLists.txt b/tests/auto/webp/CMakeLists.txt index 9d94e6b..fd83edb 100644 --- a/tests/auto/webp/CMakeLists.txt +++ b/tests/auto/webp/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwebp Test: ##################################################################### -qt_add_test(tst_qwebp +qt_internal_add_test(tst_qwebp SOURCES tst_qwebp.cpp PUBLIC_LIBRARIES @@ -20,7 +20,7 @@ set(webp_resource_files "images/kollada_noalpha.webp" ) -qt_add_resource(tst_qwebp "webp" +qt_internal_add_resource(tst_qwebp "webp" PREFIX "/" FILES diff --git a/tests/benchmarks/mng/CMakeLists.txt b/tests/benchmarks/mng/CMakeLists.txt index 2531a6e..1b6db19 100644 --- a/tests/benchmarks/mng/CMakeLists.txt +++ b/tests/benchmarks/mng/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qmng Binary: ##################################################################### -qt_add_benchmark(tst_bench_qmng +qt_internal_add_benchmark(tst_bench_qmng SOURCES tst_qmng.cpp PUBLIC_LIBRARIES @@ -36,7 +36,7 @@ set(mng_resource_files "mng/fire.mng" ) -qt_add_resource(tst_bench_qmng "mng" +qt_internal_add_resource(tst_bench_qmng "mng" PREFIX "/" BASE diff --git a/tests/benchmarks/tiff/CMakeLists.txt b/tests/benchmarks/tiff/CMakeLists.txt index 2632376..f31e553 100644 --- a/tests/benchmarks/tiff/CMakeLists.txt +++ b/tests/benchmarks/tiff/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_bench_qtiff Binary: ##################################################################### -qt_add_benchmark(tst_bench_qtiff +qt_internal_add_benchmark(tst_bench_qtiff SOURCES tst_qtiff.cpp PUBLIC_LIBRARIES @@ -240,7 +240,7 @@ set(tiff_resource_files "tiff/tiled_rgb.tiff" ) -qt_add_resource(tst_bench_qtiff "tiff" +qt_internal_add_resource(tst_bench_qtiff "tiff" PREFIX "/" BASE -- cgit v1.2.1