demos: grand refactoring

CMakePresets.json

@@ -64,6 +64,11 @@
             },
             "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }
         },
+        {
+          "name": "x64-debug-docs",
+          "inherits": "x64-debug",
+          "cacheVariables": { "SILKIT_BUILD_DOCS": "ON" }
+        },
         {
             "name": "x64-release",
             "displayName": "x64 Release",

Demos/CMakeLists.txt

@@ -97,10 +97,13 @@ else()
     set(_DEMO_OUTPUT_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>")
 endif()
 
+set(SILKIT_DEMO_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 macro(make_silkit_demo executableName demoSourceFile)
+
     add_executable(${executableName}
         ${demoSourceFile}
-        $<$<CXX_COMPILER_ID:MSVC>: "${CMAKE_CURRENT_SOURCE_DIR}/../demo.manifest" >
+        $<$<CXX_COMPILER_ID:MSVC>: "${CMAKE_CURRENT_SOURCE_DIR}/../../demo.manifest" >
     )
     remove_definitions(-DEXPORT_SilKitAPI)
 
@@ -124,29 +127,31 @@ macro(make_silkit_demo executableName demoSourceFile)
             SilKit::SilKit 
             Threads::Threads
     )
-
+    target_include_directories(${executableName} PRIVATE ${SILKIT_DEMO_DIR}/include)
     if(MSVC)
         target_compile_options(${executableName} PRIVATE /wd4996)
     endif()
 
     add_dependencies(Demos ${executableName})
-    set(demo_list "${demo_list} ${executableName}" PARENT_SCOPE)
+
 endmacro()
 
 #######################################################################################################################
 # Add the actual demo projects
 #######################################################################################################################
 # C++ Demos
-add_subdirectory(Can)
-add_subdirectory(Ethernet)
-add_subdirectory(Flexray)
-add_subdirectory(Lin)
-add_subdirectory(PubSub)
-add_subdirectory(Rpc)
-add_subdirectory(Benchmark)
-add_subdirectory(NetworkSimulator)
-
-message(STATUS "Demos available: ${demo_list}")
+set_property(GLOBAL PROPERTY demo_list_property "")
+
+add_subdirectory(communication/Can)
+add_subdirectory(communication/Ethernet)
+add_subdirectory(communication/Flexray)
+add_subdirectory(communication/Lin)
+add_subdirectory(communication/PubSub)
+add_subdirectory(communication/Rpc)
+add_subdirectory(tools/Benchmark)
+add_subdirectory(api/SimpleCan)
+add_subdirectory(api/NetworkSimulator)
+
 #######################################################################################################################
 # VisualStudio specific setup
 #######################################################################################################################