diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 90fec924..ede5df3e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,13 +1,13 @@
 #c++
-#add_subdirectory(desktop)
-#add_subdirectory(gallery)
-#add_subdirectory(layouts)
-#add_subdirectory(listbox)
-#add_subdirectory(messagebox)
-#add_subdirectory(mycontrols)
-#add_subdirectory(qvgviewer)
-#add_subdirectory(thumbnails)
-#add_subdirectory(tabview)
+add_subdirectory(desktop)
+add_subdirectory(gallery)
+add_subdirectory(layouts)
+add_subdirectory(listbox)
+add_subdirectory(messagebox)
+add_subdirectory(mycontrols)
+add_subdirectory(qvgviewer)
+add_subdirectory(thumbnails)
+add_subdirectory(tabview)
 add_subdirectory(iotdashboard)
 
 #qml
@@ -15,6 +15,4 @@ add_subdirectory(boxes)
 add_subdirectory(buttons)
 add_subdirectory(frames)
 add_subdirectory(glabels)
-add_subdirectory(messageboxQml)
-
-# TODO
\ No newline at end of file
+add_subdirectory(messageboxQml)
\ No newline at end of file
diff --git a/examples/desktop/CMakeLists.txt b/examples/desktop/CMakeLists.txt
index 8b2cd0e3..681d713d 100644
--- a/examples/desktop/CMakeLists.txt
+++ b/examples/desktop/CMakeLists.txt
@@ -1,4 +1,16 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_SOURCES
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME desktop)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/gallery/CMakeLists.txt b/examples/gallery/CMakeLists.txt
index 4177e9e1..4b9fb6d0 100644
--- a/examples/gallery/CMakeLists.txt
+++ b/examples/gallery/CMakeLists.txt
@@ -1,50 +1,66 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_HEADERS
-    label/LabelPage.h
+    label/LabelPage.h)
 
 list(APPEND TARGET_SOURCES
-    label/LabelPage.cpp
+    label/LabelPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    slider/SliderPage.h
+    slider/SliderPage.h)
 
 list(APPEND TARGET_SOURCES
-    slider/SliderPage.cpp
+    slider/SliderPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    progressbar/ProgressBarPage.h
+    progressbar/ProgressBarPage.h)
 
 list(APPEND TARGET_SOURCES
-    progressbar/ProgressBarPage.cpp
+    progressbar/ProgressBarPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    button/ButtonPage.h
+    button/ButtonPage.h)
 
 list(APPEND TARGET_SOURCES
-    button/ButtonPage.cpp
+    button/ButtonPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    textinput/TextInputPage.h
+    textinput/TextInputPage.h)
 
 list(APPEND TARGET_SOURCES
-    textinput/TextInputPage.cpp
+    textinput/TextInputPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    selector/SelectorPage.h
+    selector/SelectorPage.h)
 
 list(APPEND TARGET_SOURCES
-    selector/SelectorPage.cpp
+    selector/SelectorPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    dialog/DialogPage.h
+    dialog/DialogPage.h)
 
 list(APPEND TARGET_SOURCES
-    dialog/DialogPage.cpp
+    dialog/DialogPage.cpp)
 
 list(APPEND TARGET_HEADERS
-    Page.h
+    Page.h)
 
 list(APPEND TARGET_SOURCES
     Page.cpp
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME gallery)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
+
+target_include_directories(${TARGET_NAME}
+   PRIVATE
+       ${CMAKE_CURRENT_LIST_DIR})
\ No newline at end of file
diff --git a/examples/layouts/CMakeLists.txt b/examples/layouts/CMakeLists.txt
index 1a57b07a..0e347229 100644
--- a/examples/layouts/CMakeLists.txt
+++ b/examples/layouts/CMakeLists.txt
@@ -1,7 +1,5 @@
-CONFIG += qskexample qskqmlexport
-
 list(APPEND TARGET_RESSOURCES
-    layouts.qrc
+    layouts.qrc)
 
 list(APPEND TARGET_HEADERS
     TestRectangle.h
@@ -10,7 +8,7 @@ list(APPEND TARGET_HEADERS
     GridLayoutPage.h
     LinearLayoutPage.h
     DynamicConstraintsPage.h
-    StackLayoutPage.h
+    StackLayoutPage.h)
 
 list(APPEND TARGET_SOURCES
     TestRectangle.cpp
@@ -20,4 +18,20 @@ list(APPEND TARGET_SOURCES
     LinearLayoutPage.cpp
     DynamicConstraintsPage.cpp
     StackLayoutPage.cpp
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME layouts)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        AUTORCC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qskqmlexport
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/listbox/CMakeLists.txt b/examples/listbox/CMakeLists.txt
index 8b2cd0e3..c8c6131f 100644
--- a/examples/listbox/CMakeLists.txt
+++ b/examples/listbox/CMakeLists.txt
@@ -1,4 +1,17 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_SOURCES
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME listbox)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        AUTORCC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/messagebox/CMakeLists.txt b/examples/messagebox/CMakeLists.txt
index 8b2cd0e3..05eda1d9 100644
--- a/examples/messagebox/CMakeLists.txt
+++ b/examples/messagebox/CMakeLists.txt
@@ -1,4 +1,17 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_SOURCES
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME messagebox)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        AUTORCC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/mycontrols/CMakeLists.txt b/examples/mycontrols/CMakeLists.txt
index e8931b22..9563e9f2 100644
--- a/examples/mycontrols/CMakeLists.txt
+++ b/examples/mycontrols/CMakeLists.txt
@@ -1,12 +1,25 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_SOURCES
     MySkin.cpp
     MyToggleButton.cpp
     MyToggleButtonSkinlet.cpp
-    main.cpp
+    main.cpp)
 
 list(APPEND TARGET_HEADERS
     MyToggleButton.h
     MyToggleButtonSkinlet.h
-    MySkin.h
+    MySkin.h)
+
+set(TARGET_NAME mycontrols)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        AUTORCC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/qvgviewer/CMakeLists.txt b/examples/qvgviewer/CMakeLists.txt
index 54aea663..133d508b 100644
--- a/examples/qvgviewer/CMakeLists.txt
+++ b/examples/qvgviewer/CMakeLists.txt
@@ -1,32 +1,45 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_HEADERS
-    MainWindow.h
+    MainWindow.h)
 
 list(APPEND TARGET_SOURCES
     MainWindow.cpp
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME qvgviewer)
 
 #CONFIG += autoqvg
 
-autoqvg {
-    CONFIG += qskqvg
+option(autoqvg "enable automatic qvg commpilation" OFF)
 
-    QVGlist(APPEND TARGET_RESSOURCES
-        qvgviewer.qrc
+if(autoqvg)
+    # CONFIG += qskqvg # TODO why?
 
-    SVGSOURCES =
+    list(APPEND TARGET_RESSOURCES
+        qvgviewer.qrc)
+
+    list(APPEND SVGSOURCES
         svg/01.01.10.svg
         svg/01.03.04q.svg
         svg/01.08.05q.svg
-        svg/01.25.18.svg
-
-} else {
-
-#When cross compiling we need to have the svg2qvg tool being
-#compiled for the build environment - not for the one of the target.
-#So we better have precompiled qvg files in the repository to
-#make the build process much easier
+        svg/01.25.18.svg)
+else()
+    # When cross compiling we need to have the svg2qvg tool being
+    # compiled for the build environment - not for the one of the target.
+    # So we better have precompiled qvg files in the repository to
+    # make the build process much easier
     list(APPEND TARGET_RESSOURCES
-        qvgviewer.qrc
-}
+        qvgviewer.qrc)
+endif()
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        AUTORCC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/tabview/CMakeLists.txt b/examples/tabview/CMakeLists.txt
index eb86cab2..dc5c07fc 100644
--- a/examples/tabview/CMakeLists.txt
+++ b/examples/tabview/CMakeLists.txt
@@ -1,12 +1,24 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_HEADERS
     CustomSlider.h
     CustomSliderSkinlet.h
-    OtherSlider.h
+    OtherSlider.h)
 
 list(APPEND TARGET_SOURCES
     CustomSlider.cpp
     CustomSliderSkinlet.cpp
     OtherSlider.cpp
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME tabview)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES} ${TARGET_HEADERS})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file
diff --git a/examples/thumbnails/CMakeLists.txt b/examples/thumbnails/CMakeLists.txt
index 8b2cd0e3..9b01107f 100644
--- a/examples/thumbnails/CMakeLists.txt
+++ b/examples/thumbnails/CMakeLists.txt
@@ -1,4 +1,16 @@
-CONFIG += qskexample
-
 list(APPEND TARGET_SOURCES
-    main.cpp
+    main.cpp)
+
+set(TARGET_NAME thumbnails)
+
+add_executable(${TARGET_NAME} ${TARGET_SOURCES})
+
+set_target_properties(${TARGET_NAME}
+    PROPERTIES
+        AUTOMOC ON
+        FOLDER examples)
+
+target_link_libraries(${TARGET_NAME}
+    PRIVATE
+        qskinny
+        qsktestsupport)
\ No newline at end of file