diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-25 14:36:34 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 14:36:23 +0200 |
commit | a48182cb9629c7fc954c30a80d7f2da658aa153b (patch) | |
tree | 485ca630b0e259fcadd45b86ef56a9a4f78cbd98 | |
parent | 745e4182929232c930feeee37adebdfc9fb96eaa (diff) |
CMake: Regenerate projects before API change
Task-number: QTBUG-86815
Change-Id: Id8da24b8a26f0263324a8fed5fd9cedbfa3ee11a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | .cmake.conf | 1 | ||||
-rw-r--r-- | .prev_CMakeLists.txt | 16 | ||||
-rw-r--r-- | CMakeLists.txt | 5 | ||||
-rw-r--r-- | examples/demos/calqlatr/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/clocks/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/coffee/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/maroon/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/photosurface/CMakeLists.txt | 7 | ||||
-rw-r--r-- | examples/demos/photoviewer/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/rssnews/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/samegame/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/stocqt/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/demos/tweetsearch/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/tutorials/alarms/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/quick/.prev_CMakeLists.txt | 2 |
15 files changed, 78 insertions, 13 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 000000000..930548045 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 000000000..368bd26af --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qtdoc.pro. + +cmake_minimum_required(VERSION 3.15.0) + +include(.cmake.conf) +project(doc_FIXME + VERSION "${QT_REPO_MODULE_VERSION}" + DESCRIPTION "Qt doc_FIXME Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt index f13b561a1..e50efb53a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) -project(QtDoc - VERSION 6.0.0 +include(.cmake.conf) +project(QtDoc # special case + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Documentation and examples" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/examples/demos/calqlatr/CMakeLists.txt b/examples/demos/calqlatr/CMakeLists.txt index 678259cf0..f343ebb41 100644 --- a/examples/demos/calqlatr/CMakeLists.txt +++ b/examples/demos/calqlatr/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/calqlatr") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/calqlatr") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/clocks/CMakeLists.txt b/examples/demos/clocks/CMakeLists.txt index c3385e9da..13662b310 100644 --- a/examples/demos/clocks/CMakeLists.txt +++ b/examples/demos/clocks/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/clocks") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/clocks") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/coffee/CMakeLists.txt b/examples/demos/coffee/CMakeLists.txt index a08cfb937..4a0c12d70 100644 --- a/examples/demos/coffee/CMakeLists.txt +++ b/examples/demos/coffee/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/maroon/CMakeLists.txt b/examples/demos/maroon/CMakeLists.txt index 1c4ec8bbe..c51f5722c 100644 --- a/examples/demos/maroon/CMakeLists.txt +++ b/examples/demos/maroon/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/maroon") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/maroon") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/photosurface/CMakeLists.txt b/examples/demos/photosurface/CMakeLists.txt index 1cd5f26c6..e42f45ffe 100644 --- a/examples/demos/photosurface/CMakeLists.txt +++ b/examples/demos/photosurface/CMakeLists.txt @@ -1,4 +1,5 @@ # Generated from photosurface.pro. +# special case skip regeneration cmake_minimum_required(VERSION 3.14) project(photosurface LANGUAGES CXX) @@ -9,7 +10,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/photosurface") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/photosurface") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/photoviewer/CMakeLists.txt b/examples/demos/photoviewer/CMakeLists.txt index a857a1dda..c3f9f1b46 100644 --- a/examples/demos/photoviewer/CMakeLists.txt +++ b/examples/demos/photoviewer/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/photoviewer") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/photoviewer") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/rssnews/CMakeLists.txt b/examples/demos/rssnews/CMakeLists.txt index 90b7e0bbc..523908201 100644 --- a/examples/demos/rssnews/CMakeLists.txt +++ b/examples/demos/rssnews/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/rssnews") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/rssnews") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/samegame/CMakeLists.txt b/examples/demos/samegame/CMakeLists.txt index eeeaffdd0..9182c35c9 100644 --- a/examples/demos/samegame/CMakeLists.txt +++ b/examples/demos/samegame/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/samegame") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/samegame") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/stocqt/CMakeLists.txt b/examples/demos/stocqt/CMakeLists.txt index 4c3bb56e1..18e21c391 100644 --- a/examples/demos/stocqt/CMakeLists.txt +++ b/examples/demos/stocqt/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/stocqt") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/stocqt") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/demos/tweetsearch/CMakeLists.txt b/examples/demos/tweetsearch/CMakeLists.txt index c65700580..2dc82e9af 100644 --- a/examples/demos/tweetsearch/CMakeLists.txt +++ b/examples/demos/tweetsearch/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/tweetsearch") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/tweetsearch") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/tutorials/alarms/CMakeLists.txt b/examples/tutorials/alarms/CMakeLists.txt index 797f5a528..9470cd8b0 100644 --- a/examples/tutorials/alarms/CMakeLists.txt +++ b/examples/tutorials/alarms/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/demos/alarms") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/alarms") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/tests/auto/quick/.prev_CMakeLists.txt b/tests/auto/quick/.prev_CMakeLists.txt new file mode 100644 index 000000000..9a7f6b74b --- /dev/null +++ b/tests/auto/quick/.prev_CMakeLists.txt @@ -0,0 +1,2 @@ +# Generated from quick.pro. + |