diff --git a/CMakeLists.txt b/CMakeLists.txt index c77fec78..a205098e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,20 +39,11 @@ add_subdirectory(support) add_subdirectory(examples) add_subdirectory(playground) -#TODO +#TODO add doxygen support #OTHER_FILES = #doc / Doxyfile #doc/*.dox # doc/*.metadox # doc/classes/*.dox # doc/classes/*.metadox -# TODO - -# TODO -# qmlexport.depends = src -# inputcontext.depends = src -# skins.depends = src -# tools.depends = src -# support.depends = src skins -# examples.depends = tools support skins qmlexport -# playground.depends = tools support skins qmlexport +# TODO \ No newline at end of file diff --git a/examples/iotdashboard/CMakeLists.txt b/examples/iotdashboard/CMakeLists.txt index 718a9ee9..3a52c3b6 100644 --- a/examples/iotdashboard/CMakeLists.txt +++ b/examples/iotdashboard/CMakeLists.txt @@ -84,9 +84,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE qskinny qsktestsupport - Qt5::Svg) - -# TODO: examples should not use private headers -target_link_libraries(${TARGET_NAME} - PRIVATE - Qt5::QuickPrivate) # TODO why not transive by qskinny target \ No newline at end of file + Qt5::Svg) \ No newline at end of file diff --git a/playground/CMakeLists.txt b/playground/CMakeLists.txt index f954281e..75e9f70b 100644 --- a/playground/CMakeLists.txt +++ b/playground/CMakeLists.txt @@ -1,15 +1,17 @@ -#add_subdirectory(anchors) -#add_subdirectory(dials) +add_subdirectory(anchors) +add_subdirectory(dials) add_subdirectory(dialogbuttons) -#add_subdirectory(invoker) -#add_subdirectory(inputpanel) -#add_subdirectory(images) -#add_subdirectory(shadows) +add_subdirectory(invoker) +add_subdirectory(inputpanel) +add_subdirectory(images) +add_subdirectory(shadows) -if(TARGET Qt5::WebEngine) # TODO check how to add optionally - #add_subdirectory(webview) +# if(TARGET Qt5::WebEngine) # TODO check how to add optionally +if(TRUE) + add_subdirectory(webview) endif() -if(TARGET Qt5::QuickWidgets) # TODO check how to add optionally - #add_subdirectory(grids) +# if(TARGET Qt5::QuickWidgets) # TODO check how to add optionally +if(TRUE) + add_subdirectory(grids) endif() diff --git a/playground/anchors/CMakeLists.txt b/playground/anchors/CMakeLists.txt index 10af3778..9f9c9f19 100644 --- a/playground/anchors/CMakeLists.txt +++ b/playground/anchors/CMakeLists.txt @@ -1,21 +1,36 @@ -CONFIG += qskexample - list(APPEND TARGET_HEADERS kiwi/Constraint.h kiwi/Expression.h kiwi/Solver.h kiwi/Strength.h kiwi/Term.h - kiwi/Variable.h + kiwi/Variable.h) list(APPEND TARGET_SOURCES kiwi/Expression.cpp kiwi/Constraint.cpp - kiwi/Solver.cpp + kiwi/Solver.cpp) list(APPEND TARGET_HEADERS - AnchorBox.h + AnchorBox.h) list(APPEND TARGET_SOURCES AnchorBox.cpp - main.cpp + main.cpp) + +set(TARGET_NAME anchors) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES} + ${TARGET_HEADERS} + ${TARGET_RESSOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file diff --git a/playground/dials/CMakeLists.txt b/playground/dials/CMakeLists.txt index be7505a2..f8e8130f 100644 --- a/playground/dials/CMakeLists.txt +++ b/playground/dials/CMakeLists.txt @@ -1,17 +1,32 @@ -CONFIG += qskexample - list(APPEND TARGET_HEADERS SkinFactory.h Dial.h DialSkinlet.h - Dashboard.h + Dashboard.h) list(APPEND TARGET_SOURCES SkinFactory.cpp Dial.cpp DialSkinlet.cpp Dashboard.cpp - main.cpp + main.cpp) list(APPEND TARGET_RESSOURCES - images.qrc + images.qrc) + +set(TARGET_NAME dials) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES} + ${TARGET_HEADERS} + ${TARGET_RESSOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file diff --git a/playground/grids/CMakeLists.txt b/playground/grids/CMakeLists.txt index 52dcff88..3768aa1c 100644 --- a/playground/grids/CMakeLists.txt +++ b/playground/grids/CMakeLists.txt @@ -1,5 +1,3 @@ -CONFIG += qskexample -target_link_libraries(${TARGET_NAME} PRIVATE widgets quickwidgets) list(APPEND TARGET_HEADERS GridAccessor.h @@ -7,7 +5,7 @@ list(APPEND TARGET_HEADERS GridWidgets.h GridGraphics.h GridQuick.h - TestBox.h + TestBox.h) list(APPEND TARGET_SOURCES GridAccessor.cpp @@ -16,12 +14,30 @@ list(APPEND TARGET_SOURCES GridGraphics.cpp GridQuick.cpp TestBox.cpp - main.cpp + main.cpp) -linux { - pedantic - { - QMAKE_CXXFLAGS += -isystem $$[ QT_INSTALL_HEADERS ] / QtQuickWidgets QMAKE_CXXFLAGS += - -isystem $$[ QT_INSTALL_HEADERS ] / QtWidgets - } -} +set(TARGET_NAME grid) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES} + ${TARGET_HEADERS}) + +# TODO +#linux { +# pedantic +# { +# QMAKE_CXXFLAGS += -isystem $$[ QT_INSTALL_HEADERS ] / QtQuickWidgets QMAKE_CXXFLAGS += +# -isystem $$[ QT_INSTALL_HEADERS ] / QtWidgets +# } +#} + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport + Qt5::QuickWidgets) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file diff --git a/playground/images/CMakeLists.txt b/playground/images/CMakeLists.txt index 771aff5c..66915eab 100644 --- a/playground/images/CMakeLists.txt +++ b/playground/images/CMakeLists.txt @@ -1,15 +1,27 @@ -CONFIG += qskexample qskqmlexport - -target_link_libraries(${TARGET_NAME} - PRIVATE - Qt5::QuickPrivate) - list(APPEND TARGET_RESSOURCES - images.qrc + images.qrc) list(APPEND TARGET_HEADERS - Image.h + Image.h) list(APPEND TARGET_SOURCES Image.cpp - main.cpp + main.cpp) + +set(TARGET_NAME images) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES} + ${TARGET_HEADERS} + ${TARGET_RESSOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qskqmlexport + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file diff --git a/playground/inputpanel/CMakeLists.txt b/playground/inputpanel/CMakeLists.txt index 8b2cd0e3..9e950bbd 100644 --- a/playground/inputpanel/CMakeLists.txt +++ b/playground/inputpanel/CMakeLists.txt @@ -1,4 +1,17 @@ -CONFIG += qskexample - list(APPEND TARGET_SOURCES - main.cpp + main.cpp) + +set(TARGET_NAME inputpanel) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) diff --git a/playground/invoker/CMakeLists.txt b/playground/invoker/CMakeLists.txt index cc6566c3..26a08274 100644 --- a/playground/invoker/CMakeLists.txt +++ b/playground/invoker/CMakeLists.txt @@ -1,12 +1,24 @@ -CONFIG += qskexample - -QMAKE_MOC_OPTIONS += -nw # disable warning about missing READ - list(APPEND TARGET_HEADERS Callback.h - Invoker.h + Invoker.h) list(APPEND TARGET_SOURCES Callback.cpp Invoker.cpp - main.cpp + main.cpp) + +set(TARGET_NAME invoker) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES} + ${TARGET_HEADERS}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + AUTOMOC_MOC_OPTIONS -nw + FOLDER playground) \ No newline at end of file diff --git a/playground/shadows/CMakeLists.txt b/playground/shadows/CMakeLists.txt index 00b2b539..f8a9ba9a 100644 --- a/playground/shadows/CMakeLists.txt +++ b/playground/shadows/CMakeLists.txt @@ -1,8 +1,22 @@ -CONFIG += qskexample - list(APPEND TARGET_HEADERS - ShadowedBox.h + ShadowedBox.h) list(APPEND TARGET_SOURCES ShadowedBox.cpp - main.cpp + main.cpp) + +set(TARGET_NAME shadows) + +add_executable(${TARGET_NAME} + ${TARGET_HEADERS} + ${TARGET_SOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file diff --git a/playground/webview/CMakeLists.txt b/playground/webview/CMakeLists.txt index b14cbb64..8bd5b756 100644 --- a/playground/webview/CMakeLists.txt +++ b/playground/webview/CMakeLists.txt @@ -1,5 +1,20 @@ -CONFIG += qskexample -target_link_libraries(${TARGET_NAME} PRIVATE webengine webengine-private webenginecore-private core-private) list(APPEND TARGET_SOURCES - main.cpp + main.cpp) + +set(TARGET_NAME webview) + +add_executable(${TARGET_NAME} + ${TARGET_SOURCES}) + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + qsktestsupport + Qt5::WebEngine + Qt5::WebEnginePrivate) + +set_target_properties(${TARGET_NAME} + PROPERTIES + AUTOMOC ON + FOLDER playground) \ No newline at end of file