From 76108058796bf0884f6fd128d81f1bc49f9a56af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Feb 2020 08:15:50 +0100 Subject: Regenerate examples Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- examples/xml/dombookmarks/CMakeLists.txt | 7 +++- examples/xml/htmlinfo/.prev_CMakeLists.txt | 44 +++++++++++++++++++++++++ examples/xml/htmlinfo/CMakeLists.txt | 24 ++++++++++++-- examples/xml/rsslisting/CMakeLists.txt | 7 +++- examples/xml/streambookmarks/CMakeLists.txt | 7 +++- examples/xml/xmlstreamlint/.prev_CMakeLists.txt | 27 +++++++++++++++ examples/xml/xmlstreamlint/CMakeLists.txt | 7 ++-- 7 files changed, 114 insertions(+), 9 deletions(-) create mode 100644 examples/xml/htmlinfo/.prev_CMakeLists.txt create mode 100644 examples/xml/xmlstreamlint/.prev_CMakeLists.txt (limited to 'examples/xml') diff --git a/examples/xml/dombookmarks/CMakeLists.txt b/examples/xml/dombookmarks/CMakeLists.txt index 7a9059393d..24d34443de 100644 --- a/examples/xml/dombookmarks/CMakeLists.txt +++ b/examples/xml/dombookmarks/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/xml/dombookmarks") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Xml) find_package(Qt6 COMPONENTS Widgets) @@ -20,9 +22,12 @@ add_qt_gui_executable(dombookmarks xbeltree.cpp xbeltree.h ) target_link_libraries(dombookmarks PUBLIC + Qt::Core + Qt::Gui Qt::Widgets Qt::Xml ) + install(TARGETS dombookmarks RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/xml/htmlinfo/.prev_CMakeLists.txt b/examples/xml/htmlinfo/.prev_CMakeLists.txt new file mode 100644 index 0000000000..77fa423eff --- /dev/null +++ b/examples/xml/htmlinfo/.prev_CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from htmlinfo.pro. + +cmake_minimum_required(VERSION 3.14) +project(htmlinfo LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/xml/htmlinfo") + +find_package(Qt6 COMPONENTS Core) + +add_executable(htmlinfo + main.cpp +) +target_link_libraries(htmlinfo PUBLIC + Qt::Core +) + + +# Resources: +set(resources_resource_files + "apache_org.html" + "simpleexample.html" + "trolltech_com.html" + "w3c_org.html" + "youtube_com.html" +) + +qt6_add_resources(htmlinfo "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) + +install(TARGETS htmlinfo + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/xml/htmlinfo/CMakeLists.txt b/examples/xml/htmlinfo/CMakeLists.txt index dde6e17fa0..77fa423eff 100644 --- a/examples/xml/htmlinfo/CMakeLists.txt +++ b/examples/xml/htmlinfo/CMakeLists.txt @@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.14) project(htmlinfo LANGUAGES CXX) -find_package(Qt6 COMPONENTS Core) # special case: add - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/xml/htmlinfo") + +find_package(Qt6 COMPONENTS Core) add_executable(htmlinfo main.cpp @@ -19,6 +19,24 @@ add_executable(htmlinfo target_link_libraries(htmlinfo PUBLIC Qt::Core ) + + +# Resources: +set(resources_resource_files + "apache_org.html" + "simpleexample.html" + "trolltech_com.html" + "w3c_org.html" + "youtube_com.html" +) + +qt6_add_resources(htmlinfo "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) + install(TARGETS htmlinfo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/xml/rsslisting/CMakeLists.txt index c2c699ac5a..96f79d2043 100644 --- a/examples/xml/rsslisting/CMakeLists.txt +++ b/examples/xml/rsslisting/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/xml/rsslisting") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Network) find_package(Qt6 COMPONENTS Xml) find_package(Qt6 COMPONENTS Widgets) @@ -20,10 +22,13 @@ add_qt_gui_executable(rsslisting rsslisting.cpp rsslisting.h ) target_link_libraries(rsslisting PUBLIC + Qt::Core + Qt::Gui Qt::Network Qt::Widgets Qt::Xml ) + install(TARGETS rsslisting RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/xml/streambookmarks/CMakeLists.txt b/examples/xml/streambookmarks/CMakeLists.txt index a7ec5dfac7..22ba383558 100644 --- a/examples/xml/streambookmarks/CMakeLists.txt +++ b/examples/xml/streambookmarks/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/xml/streambookmarks") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Xml) find_package(Qt6 COMPONENTS Widgets) @@ -21,9 +23,12 @@ add_qt_gui_executable(streambookmarks xbelwriter.cpp xbelwriter.h ) target_link_libraries(streambookmarks PUBLIC + Qt::Core + Qt::Gui Qt::Widgets Qt::Xml ) + install(TARGETS streambookmarks RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/xml/xmlstreamlint/.prev_CMakeLists.txt b/examples/xml/xmlstreamlint/.prev_CMakeLists.txt new file mode 100644 index 0000000000..bb5cad16da --- /dev/null +++ b/examples/xml/xmlstreamlint/.prev_CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from xmlstreamlint.pro. + +cmake_minimum_required(VERSION 3.14) +project(xmlstreamlint LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/xml/xmlstreamlint") + +find_package(Qt6 COMPONENTS Core) + +add_executable(xmlstreamlint + main.cpp +) +target_link_libraries(xmlstreamlint PUBLIC + Qt::Core +) + +install(TARGETS xmlstreamlint + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/xml/xmlstreamlint/CMakeLists.txt b/examples/xml/xmlstreamlint/CMakeLists.txt index d12b549996..b100943537 100644 --- a/examples/xml/xmlstreamlint/CMakeLists.txt +++ b/examples/xml/xmlstreamlint/CMakeLists.txt @@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.14) project(xmlstreamlint LANGUAGES CXX) -find_package(Qt6 COMPONENTS Core Xml) # special case: add - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/xml/xmlstreamlint") + +find_package(Qt6 COMPONENTS Core Xml) # special case add_executable(xmlstreamlint main.cpp @@ -20,6 +20,7 @@ target_link_libraries(xmlstreamlint PUBLIC Qt::Core Qt::Xml # special case: add ) + install(TARGETS xmlstreamlint RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3