diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 13:55:15 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-03-06 09:33:47 +0100 |
| commit | 616646be64de9605a5a981821e061d52f48c2468 (patch) | |
| tree | d6664e223e6465b636c4d9c914b6ee3dca80df89 | |
| parent | 800a965e4914bd4ff24e1c4bf8b93d83535a0c68 (diff) | |
| download | qttranslations-616646be64de9605a5a981821e061d52f48c2468.tar.gz | |
Remove remains of qmake conversion from CMakeLists.txt files
Change-Id: I91e0ce033a5bde5d0e0545ddc6e75c5817b64d14
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | translations/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a553a47..a9d5dfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,25 +1,22 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qttranslations.pro. - cmake_minimum_required(VERSION 3.16) include(.cmake.conf) -project(QtTranslations # special case +project(QtTranslations VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt Translations" # special case + DESCRIPTION "Qt Translations" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) -# special case begin # Make sure we use the fixed BASE argument of qt_add_resource. set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) set(QT_REPO_NOT_WARNINGS_CLEAN TRUE) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case -find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Linguist) # special case +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Linguist) include(QtSetup) # for qt_install @@ -28,4 +25,3 @@ if(TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate AND TARGET ${QT_CMAKE_EXPORT_NAM else() message(STATUS "Skipping adding translation custom targets due to missing lupdate or lconvert.") endif() -# special case end diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt index d006e5b..90fbe6e 100644 --- a/translations/CMakeLists.txt +++ b/translations/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# special case skip regeneration - add_custom_target(ts-all) set(repo_root_directory "${CMAKE_CURRENT_SOURCE_DIR}/../..") |