qiurui
/
qtimageformats
mirror of https://github.com/qt/qtimageformats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remains of qmake conversion from CMakeLists.txt files 

Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Friedemann Kleint 2023-02-08 15:40:56 +01:00
parent d7f26f3717
commit 93ece87be2
27 changed files with 6 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1,20 +1,18 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from qtimageformats.pro.
cmake_minimum_required(VERSION 3.16)
include(.cmake.conf)
project(QtImageFormats # special case
project(QtImageFormats
VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt ImageFormats Libraries" # special case
DESCRIPTION "Qt ImageFormats Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui)
if(NOT TARGET Qt::Gui)
message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.")
return()

2
src/CMakeLists.txt
View File

@ -1,7 +1,5 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from src.pro.
add_subdirectory(imageformats)
add_subdirectory(plugins)

4
src/imageformats/CMakeLists.txt
View File

@ -1,12 +1,8 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from imageformats.pro.
# special case begin
add_library(ImageFormats INTERFACE)
qt_internal_add_docs(ImageFormats
doc/qtimageformats.qdocconf
)
# special case end

2
src/plugins/CMakeLists.txt
View File

@ -1,6 +1,4 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from plugins.pro.
add_subdirectory(imageformats)

4
src/plugins/imageformats/CMakeLists.txt
View File

@ -1,9 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from imageformats.pro.
# special case begin
qt_feature_module_begin(
NO_MODULE
PUBLIC_FILE "qtimageformats-config.h"
@ -11,7 +8,6 @@ qt_feature_module_begin(
)
include(../../imageformats/configure.cmake)
qt_feature_module_end(NO_MODULE)
# special case end
add_subdirectory(tga)
add_subdirectory(wbmp)

5
src/plugins/imageformats/icns/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from icns.pro.
#####################################################################
## QICNSPlugin Plugin:
#####################################################################
@ -20,6 +18,3 @@ qt_internal_add_plugin(QICNSPlugin
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:icns.pro:<TRUE>:
# OTHER_FILES = "icns.json"

6
src/plugins/imageformats/jp2/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from jp2.pro.
#####################################################################
## QJp2Plugin Plugin:
#####################################################################
@ -18,7 +16,3 @@ qt_internal_add_plugin(QJp2Plugin
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>:
# OTHER_FILES = "jp2.json"
# QT_FOR_CONFIG = "imageformats-private"

7
src/plugins/imageformats/macheif/CMakeLists.txt
View File

@ -1,17 +1,13 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from macheif.pro.
#####################################################################
## QMacHeifPlugin Plugin:
#####################################################################
# special case begin
find_library(FWCoreFoundation CoreFoundation)
find_library(FWCoreGraphics CoreGraphics)
find_library(FWImageIO ImageIO)
# special case end
qt_internal_add_plugin(QMacHeifPlugin
OUTPUT_NAME qmacheif
@ -31,6 +27,3 @@ qt_internal_add_plugin(QMacHeifPlugin
Qt::Gui
Qt::GuiPrivate
)
#### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
# OTHER_FILES = "macheif.json"

5
src/plugins/imageformats/macjp2/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from macjp2.pro.
#####################################################################
## QMacJp2Plugin Plugin:
#####################################################################
@ -25,6 +23,3 @@ qt_internal_add_plugin(QMacJp2Plugin
Qt::Gui
Qt::GuiPrivate
)
#### Keys ignored in scope 1:.:.:macjp2.pro:<TRUE>:
# OTHER_FILES = "macjp2.json"

6
src/plugins/imageformats/mng/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from mng.pro.
#####################################################################
## QMngPlugin Plugin:
#####################################################################
@ -18,7 +16,3 @@ qt_internal_add_plugin(QMngPlugin
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:mng.pro:<TRUE>:
# OTHER_FILES = "mng.json"
# QT_FOR_CONFIG = "imageformats-private"

5
src/plugins/imageformats/tga/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from tga.pro.
#####################################################################
## QTgaPlugin Plugin:
#####################################################################
@ -18,6 +16,3 @@ qt_internal_add_plugin(QTgaPlugin
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:tga.pro:<TRUE>:
# OTHER_FILES = "tga.json"

8
src/plugins/imageformats/tiff/CMakeLists.txt
View File

@ -1,20 +1,16 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from tiff.pro.
#####################################################################
## QTiffPlugin Plugin:
#####################################################################
# special case begin
# Handle the conditional finding of either system zlib or qt zlib.
if(NOT QT_FEATURE_system_zlib)
find_package(Qt6 COMPONENTS ZlibPrivate)
elseif(NOT TARGET WrapZLIB::WrapZLIB)
qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
endif()
# special case end
qt_internal_add_plugin(QTiffPlugin
OUTPUT_NAME qtiff
@ -27,10 +23,6 @@ qt_internal_add_plugin(QTiffPlugin
Qt::Gui
)
#### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
# OTHER_FILES = "tiff.json"
# QT_FOR_CONFIG = "imageformats-private"
## Scopes:
#####################################################################

5
src/plugins/imageformats/wbmp/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from wbmp.pro.
#####################################################################
## QWbmpPlugin Plugin:
#####################################################################
@ -17,6 +15,3 @@ qt_internal_add_plugin(QWbmpPlugin
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>:
# OTHER_FILES = "wbmp.json"

33
src/plugins/imageformats/webp/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from webp.pro.
#####################################################################
## QWebpPlugin Plugin:
#####################################################################
@ -18,10 +16,6 @@ qt_internal_add_plugin(QWebpPlugin
Qt::Gui
)
#### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
# OTHER_FILES = "webp.json"
# QT_FOR_CONFIG = "imageformats-private"
## Scopes:
#####################################################################
@ -157,12 +151,11 @@ qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp
qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp
SOURCES
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c # special case
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
INCLUDE_DIRECTORIES
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures # special case
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures
)
# special case begin
set(neon_sources
../../../3rdparty/libwebp/sharpyuv/sharpyuv_neon.c
../../../3rdparty/libwebp/src/dsp/alpha_processing_neon.c
@ -187,25 +180,3 @@ if(NOT QT_FEATURE_system_webp)
qt_internal_add_simd_part(QWebpPlugin SIMD neon SOURCES ${neon_sources})
endif()
endif()
# special case end
#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY:
# QMAKE_CFLAGS = "-c99"
#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
# QMAKE_EXTRA_COMPILERS = "neon_comp"
# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON" "$(INCPATH)" "${QMAKE_FILE_IN}"
# neon_comp.dependency_type = "TYPE_C"
# neon_comp.input = "SOURCES_FOR_NEON"
# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}"
# neon_comp.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
# neon_comp.variable_out = "OBJECTS"
#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC:
# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}"
#### Keys ignored in scope 14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else:
# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}"
#### Keys ignored in scope 15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent:
# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&"

2
tests/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# 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.

2
tests/auto/dds/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from dds.pro.
#####################################################################
## tst_qdds Test:
#####################################################################

2
tests/auto/heif/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from heif.pro.
#####################################################################
## tst_qheif Test:
#####################################################################

1
tests/auto/icns/CMakeLists.txt
View File

@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from icns.pro.
#####################################################################
## tst_qicns Test:

2
tests/auto/jp2/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from jp2.pro.
#####################################################################
## tst_qjp2 Test:
#####################################################################

2
tests/auto/mng/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from mng.pro.
#####################################################################
## tst_qmng Test:
#####################################################################

2
tests/auto/tga/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from tga.pro.
#####################################################################
## tst_qtga Test:
#####################################################################

1
tests/auto/tiff/CMakeLists.txt
View File

@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from tiff.pro.
#####################################################################
## tst_qtiff Test:

2
tests/auto/wbmp/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from wbmp.pro.
#####################################################################
## tst_qwbmp Test:
#####################################################################

2
tests/auto/webp/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from webp.pro.
#####################################################################
## tst_qwebp Test:
#####################################################################

1
tests/benchmarks/CMakeLists.txt
View File

@ -1,7 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from benchmarks.pro.
if(QT_FEATURE_system_zlib)
add_subdirectory(mng)

2
tests/benchmarks/mng/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from mng.pro.
#####################################################################
## tst_bench_qmng Binary:
#####################################################################

2
tests/benchmarks/tiff/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# Generated from tiff.pro.
#####################################################################
## tst_bench_qtiff Binary:
#####################################################################