diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index a3a54bce..07ef8245 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -49,6 +49,34 @@ jobs: sudo apt install -y llvm-18-dev echo "::endgroup" + echo "::group::doxygen install" + sudo apt install -y doxygen + echo "::endgroup" + + echo "::group::sphinx install" + sudo apt install -y sphinx + echo "::endgroup" + + echo "::group::libvulkan-dev install" + sudo apt install -y libvulkan-dev + echo "::endgroup" + + echo "::group::vulkan-tools install" + sudo apt install -y vulkan-tools + echo "::endgroup" + + echo "::group::vulkan-utility-libraries-dev install" + sudo apt install -y vulkan-utility-libraries-dev + echo "::endgroup" + + echo "::group::libsdl2-dev" + sudo apt install -y libsdl2-dev + echo "::endgroup" + + echo "::group::libbsd-dev" + sudo apt install -y libbsd-dev + echo "::endgroup" + #echo "::group::clang18 install" #sudo apt install -y clang-18 #echo "::group::lldb18 install" @@ -72,6 +100,13 @@ jobs: # this should be sufficient for find_package(Catch2) to work + - name: clone imgui + run: | + + echo "::group::clone imgui" + git clone https://github.com/ocornut/imgui.git + echo "::endgroup" + - name: list /usr/lib run: | ls /usr/lib diff --git a/xo-imgui/src/imgui/CMakeLists.txt b/xo-imgui/src/imgui/CMakeLists.txt index 36663057..414d1a6d 100644 --- a/xo-imgui/src/imgui/CMakeLists.txt +++ b/xo-imgui/src/imgui/CMakeLists.txt @@ -2,9 +2,10 @@ find_path(IMGUI_INCLUDE_DIR NAMES imgui/imgui.h - DOC "path to imgui header" - HINTS ${PROJECT_SOURCE_DIR}/include -) +# HINTS ${PROJECT_SOURCE_DIR}/include # merge loser + HINTS ${XO_UMBRELLA_SOURCE_DIR} + DOC "path to imgui header") + if (IMGUI_INCLUDE_DIR) message(STATUS "found imgui/imgui.h in IMGUI_INCLUDE_DIR=[${IMGUI_INCLUDE_DIR}]")