Change: Github Workflow for Platform Detection

Author: XanderBert

.github/workflows/cmake-multi-platform.yml

@@ -2,6 +2,8 @@ name: CMake Build Test
 on: [push, pull_request]
 
 jobs:
+  # ─── Reusable setup steps are handled via composite or just duplicated minimally ───
+
   linux-lib:
     name: Linux Lib (${{ matrix.display_server }})
     runs-on: ubuntu-latest
@@ -37,7 +39,6 @@ jobs:
         run: |
           cmake -B build \
             -DEOS_BUILD_EXAMPLES=OFF \
-            -DWAYLAND_DISPLAY=${{ matrix.display_server == 'Wayland' && 'wayland-0' || '' }} \
             -DUSE_WAYLAND=${{ matrix.display_server == 'Wayland' && 'ON' || 'OFF' }} \
             -DUSE_X11=${{ matrix.display_server == 'X11' && 'ON' || 'OFF' }} \
             -DCMAKE_BUILD_TYPE=Release
@@ -79,7 +80,6 @@ jobs:
         run: |
           cmake -B build \
             -DEOS_BUILD_EXAMPLES=ON \
-            -DWAYLAND_DISPLAY=${{ matrix.display_server == 'Wayland' && 'wayland-0' || '' }} \
             -DUSE_WAYLAND=${{ matrix.display_server == 'Wayland' && 'ON' || 'OFF' }} \
             -DUSE_X11=${{ matrix.display_server == 'X11' && 'ON' || 'OFF' }} \
             -DCMAKE_BUILD_TYPE=Release

cmake/CmakeMacros.cmake

@@ -120,14 +120,23 @@ macro(DEFINE_PLATFORM)
         target_compile_definitions(EOS PUBLIC EOS_PLATFORM_WINDOWS)
         set(USE_WINDOWS TRUE)
     elseif(UNIX AND NOT APPLE)
-        if(DEFINED ENV{WAYLAND_DISPLAY})
+        if(USE_WAYLAND)
             message(STATUS "Wayland session detected")
             target_compile_definitions(EOS PUBLIC EOS_PLATFORM_WAYLAND)
-            set(USE_WAYLAND TRUE)
-        else()
+        elseif(USE_X11)
             message(STATUS "X11 session detected")
             target_compile_definitions(EOS PUBLIC EOS_PLATFORM_X11)
-            set(USE_X11 TRUE)
+        else()
+            # Fallback: detect from environment
+            if(DEFINED ENV{WAYLAND_DISPLAY})
+                message(STATUS "Wayland session detected (env)")
+                target_compile_definitions(EOS PUBLIC EOS_PLATFORM_WAYLAND)
+                set(USE_WAYLAND TRUE)
+            else()
+                message(STATUS "X11 session detected (env)")
+                target_compile_definitions(EOS PUBLIC EOS_PLATFORM_X11)
+                set(USE_X11 TRUE)
+            endif()
         endif()
     endif()
 endmacro()

examples/ModelPBR/src/main.cpp

@@ -34,7 +34,7 @@ void LoadModel(const std::filesystem::path& modelPath, std::vector<Vertex>& vert
        modelPath.string().c_str(),
        aiProcess_Triangulate
    );
-    CHECK(scene && scene->HasMeshes(), "Could not load mesh: {}", modelPath.c_str());
+    CHECK(scene && scene->HasMeshes(), "Could not load mesh: {}", modelPath.string());
 
     const aiMesh* mesh = scene->mMeshes[0];