From 957534c139a61fa4aeae14423c0a0cb9751641ac Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 09:54:00 +0000 Subject: [PATCH 1/5] Initial plan From 5bd098d2526850f2d5d06bf58336bb35ede61080 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 11:45:42 +0100 Subject: [PATCH 2/5] Optimize CMake build time by using direct vcpkg Boost config packages Co-authored-by: chrxh <73127001+chrxh@users.noreply.github.com> --- CMakeLists.txt | 9 ++++++++- source/Gui/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad18085af..cf459bdbb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,14 @@ add_executable(NetworkTests) add_executable(PersisterTests) find_package(CUDAToolkit) -find_package(Boost REQUIRED) +find_package(boost_headers CONFIG REQUIRED) +find_package(boost_regex CONFIG REQUIRED) + +# Create Boost::boost compatibility target for header-only usage +if(NOT TARGET Boost::boost) + add_library(Boost::boost ALIAS Boost::headers) +endif() + find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(cereal CONFIG REQUIRED) diff --git a/source/Gui/CMakeLists.txt b/source/Gui/CMakeLists.txt index 88509816eb..0d66423e3c 100644 --- a/source/Gui/CMakeLists.txt +++ b/source/Gui/CMakeLists.txt @@ -179,7 +179,7 @@ target_link_libraries(alien PersisterImpl) target_link_libraries(alien im_file_dialog) target_link_libraries(alien CUDA::cudart_static) target_link_libraries(alien CUDA::cuda_driver) -target_link_libraries(alien Boost::boost) +target_link_libraries(alien Boost::boost Boost::regex) target_link_libraries(alien OpenGL::GL OpenGL::GLU) target_link_libraries(alien GLEW::GLEW) target_link_libraries(alien imgui::imgui) From f05cf1ff2f63bdb2c75b0bc9d129dd2393e75059 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 12:57:11 +0100 Subject: [PATCH 3/5] Revert Boost changes and fix CMake YAML formatting Co-authored-by: chrxh <73127001+chrxh@users.noreply.github.com> --- .github/workflows/copilot-setup-steps.yml | 7 ++++--- .github/workflows/ubuntu-ci.yml | 9 +++++---- CMakeLists.txt | 9 +-------- source/Gui/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index b32269a33a..e34eb0345c 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -67,9 +67,10 @@ jobs: popd - name: Configure CMake (mit vcpkg Manifest-Mode) - run: cmake -S . -B build \ - -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DCMAKE_BUILD_TYPE=Release \ + run: > + cmake -S . -B build + -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake + -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc - name: Build diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index d3d760b647..be9cee3a96 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -55,10 +55,11 @@ jobs: popd - name: Configure CMake - run: cmake -S . -B build \ - -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DCMAKE_BUILD_TYPE=Release \ + run: > + cmake -S . -B build + -G Ninja + -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake + -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index cf459bdbb6..3ad18085af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,14 +51,7 @@ add_executable(NetworkTests) add_executable(PersisterTests) find_package(CUDAToolkit) -find_package(boost_headers CONFIG REQUIRED) -find_package(boost_regex CONFIG REQUIRED) - -# Create Boost::boost compatibility target for header-only usage -if(NOT TARGET Boost::boost) - add_library(Boost::boost ALIAS Boost::headers) -endif() - +find_package(Boost REQUIRED) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(cereal CONFIG REQUIRED) diff --git a/source/Gui/CMakeLists.txt b/source/Gui/CMakeLists.txt index 0d66423e3c..88509816eb 100644 --- a/source/Gui/CMakeLists.txt +++ b/source/Gui/CMakeLists.txt @@ -179,7 +179,7 @@ target_link_libraries(alien PersisterImpl) target_link_libraries(alien im_file_dialog) target_link_libraries(alien CUDA::cudart_static) target_link_libraries(alien CUDA::cuda_driver) -target_link_libraries(alien Boost::boost Boost::regex) +target_link_libraries(alien Boost::boost) target_link_libraries(alien OpenGL::GL OpenGL::GLU) target_link_libraries(alien GLEW::GLEW) target_link_libraries(alien imgui::imgui) From 9618776dcf78163a18637adfcbb6b9423c00fb2e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 16:22:07 +0100 Subject: [PATCH 4/5] Optimize CMake by replacing slow find_package(Boost) with manual target Co-authored-by: chrxh <73127001+chrxh@users.noreply.github.com> --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad18085af..ac3022f817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,14 @@ add_executable(NetworkTests) add_executable(PersisterTests) find_package(CUDAToolkit) -find_package(Boost REQUIRED) + +# Create Boost::boost target manually - vcpkg already provides headers in the include path +# This avoids the slow find_package(Boost) which searches extensively +if(NOT TARGET Boost::boost) + add_library(Boost::boost INTERFACE IMPORTED) + # vcpkg toolchain already adds vcpkg_installed/x64-linux/include to include dirs +endif() + find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(cereal CONFIG REQUIRED) From 222271150426fd4d75c59a861315a54b98d97e4d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 17:25:51 +0100 Subject: [PATCH 5/5] Revert CMakeLists.txt to original - keep only YAML formatting fix Co-authored-by: chrxh <73127001+chrxh@users.noreply.github.com> --- CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac3022f817..3ad18085af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,14 +51,7 @@ add_executable(NetworkTests) add_executable(PersisterTests) find_package(CUDAToolkit) - -# Create Boost::boost target manually - vcpkg already provides headers in the include path -# This avoids the slow find_package(Boost) which searches extensively -if(NOT TARGET Boost::boost) - add_library(Boost::boost INTERFACE IMPORTED) - # vcpkg toolchain already adds vcpkg_installed/x64-linux/include to include dirs -endif() - +find_package(Boost REQUIRED) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(cereal CONFIG REQUIRED)