summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-14 17:59:44 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-15 12:23:28 +0000
commit7540e57ea709459bd15c16d25535bb756392f923 (patch)
treee091baa3e0ed1b4a61678450bb90a79550da502b
parentf73456e18e0fbe959e623c94bd1ebb23769f7e34 (diff)
downloadqtx11extras-wip/cmake.tar.gz
Regenerate projectswip/cmake
Change-Id: I8a925463317cda1a507d430266d9e884ada3c6b3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--.prev_CMakeLists.txt19
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/x11extras/.prev_CMakeLists.txt7
-rw-r--r--src/x11extras/CMakeLists.txt7
-rw-r--r--tests/auto/qx11info/.prev_CMakeLists.txt15
-rw-r--r--tests/auto/qx11info/CMakeLists.txt10
6 files changed, 44 insertions, 16 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 0000000..64e4682
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qtx11extras.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(QtX11Extras
+ VERSION 6.0.0
+ DESCRIPTION "Qt X11Extras 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)
+
+if(NOT TARGET Qt::Gui)
+ message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.")
+ return()
+endif()
+qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dd8a1b..4ddd850 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(QtX11Extras
LANGUAGES CXX C
)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Gui) # special case
if(NOT TARGET Qt::Gui)
message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.")
diff --git a/src/x11extras/.prev_CMakeLists.txt b/src/x11extras/.prev_CMakeLists.txt
index 594d688..1a3118a 100644
--- a/src/x11extras/.prev_CMakeLists.txt
+++ b/src/x11extras/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## X11Extras Module:
#####################################################################
-add_qt_module(X11Extras
+qt_add_module(X11Extras
SOURCES
qx11info_x11.cpp qx11info_x11.h
DEFINES
@@ -16,10 +16,7 @@ add_qt_module(X11Extras
Qt::Core
Qt::Gui
)
-
-#### Keys ignored in scope 1:.:.:x11extras.pro:<TRUE>:
-# _LOADED = "qt_module"
-add_qt_docs(X11Extras
+qt_add_docs(X11Extras
doc/qtx11extras.qdocconf
)
diff --git a/src/x11extras/CMakeLists.txt b/src/x11extras/CMakeLists.txt
index 2bd7dd6..d2e7994 100644
--- a/src/x11extras/CMakeLists.txt
+++ b/src/x11extras/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
## X11Extras Module:
#####################################################################
-add_qt_module(X11Extras
+qt_add_module(X11Extras
SOURCES
qx11info_x11.cpp qx11info_x11.h
DEFINES
@@ -22,10 +22,7 @@ add_qt_module(X11Extras
Qt::Core
Qt::Gui
)
-
-#### Keys ignored in scope 1:.:.:x11extras.pro:<TRUE>:
-# _LOADED = "qt_module"
-add_qt_docs(X11Extras
+qt_add_docs(X11Extras
doc/qtx11extras.qdocconf
)
diff --git a/tests/auto/qx11info/.prev_CMakeLists.txt b/tests/auto/qx11info/.prev_CMakeLists.txt
new file mode 100644
index 0000000..f2bdffb
--- /dev/null
+++ b/tests/auto/qx11info/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qx11info.pro.
+
+#####################################################################
+## tst_qx11info Test:
+#####################################################################
+
+qt_add_test(tst_qx11info
+ SOURCES
+ tst_qx11info.cpp
+ PUBLIC_LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+ Qt::X11Extras
+ XCB::XCB
+)
diff --git a/tests/auto/qx11info/CMakeLists.txt b/tests/auto/qx11info/CMakeLists.txt
index 042e007..bb64ec9 100644
--- a/tests/auto/qx11info/CMakeLists.txt
+++ b/tests/auto/qx11info/CMakeLists.txt
@@ -1,16 +1,16 @@
# Generated from qx11info.pro.
+#####################################################################
+## tst_qx11info Test:
+#####################################################################
+
# begin special case
if(NOT TARGET XCB::XCB)
qt_find_package(XCB REQUIRED PROVIDED_TARGETS XCB::XCB)
endif()
# end special case
-#####################################################################
-## tst_qx11info Test:
-#####################################################################
-
-add_qt_test(tst_qx11info
+qt_add_test(tst_qx11info
SOURCES
tst_qx11info.cpp
PUBLIC_LIBRARIES