From 37554d4c0159da413c544f611df6be6af110f72a Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 11:18:47 +0200 Subject: [PATCH 01/15] Removed SSH key setup steps from the build workflow --- .github/workflows/build.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfbe212..af387b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,17 +58,6 @@ jobs: with: python-version: "3.13" - - name: Start ssh key agent - uses: webfactory/ssh-agent@v0.10.0 - with: - ssh-private-key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }} - - - name: Install SSH deploy key for rulessupport - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }} - known_hosts: github.com AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== - - name: Set vcpkg environment (Unix) if: "!startsWith(runner.os, 'Windows')" run: | @@ -117,7 +106,6 @@ jobs: conan-user: ${{secrets.LKEB_UPLOAD_USER}} conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}} conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}} - rs_ssh_key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }} - name: Linux build if: startsWith(matrix.os, 'ubuntu') From 1d58ae470a0beb37ea20d2d713bca7f76d2a5030 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 11:38:36 +0200 Subject: [PATCH 02/15] update vcpkg dependencies --- .github/workflows/build.yml | 2 +- ExampleDependencies/CMakeLists.txt | 9 +-------- vcpkg.json | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af387b5..78b8473 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - VCPKG_COMMIT_SHA: 56bb2411609227288b70117ead2c47585ba07713 # corresponds to tag 2026.04.27 + VCPKG_COMMIT_SHA: 94a541197763a4f449a1b91478df48c0584a6256 # from 2026.08.15 # for matrix check https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners jobs: diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 45ffb39..b7af799 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -41,11 +41,7 @@ set_target_properties(hwy_list_targets PROPERTIES EXCLUDE_FROM_ALL True) if(${MV_EXAMPLES_USE_VCPKG}) find_package(blake3 CONFIG REQUIRED) - - if(NOT APPLE) - include(cmake/ci_fixes.cmake) - find_package(faiss CONFIG REQUIRED) - endif() + find_package(faiss CONFIG REQUIRED) endif() # ----------------------------------------------------------------------------- @@ -106,10 +102,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE hwy hwy_contrib) if(${MV_EXAMPLES_USE_VCPKG}) target_link_libraries(${PROJECT_NAME} PRIVATE BLAKE3::blake3) - - if(NOT APPLE) target_link_libraries(${PROJECT_NAME} PRIVATE faiss) - endif() target_compile_definitions (${PROJECT_NAME} PRIVATE __USE_VCPKG__) endif() diff --git a/vcpkg.json b/vcpkg.json index 7b3fe05..02581b6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,14 +3,16 @@ "version": "0.0.1", "dependencies": [ "blake3", - { - "name": "faiss", - "platform": "!osx" - } + "faiss" ], - "builtin-baseline":"d5ec528843d29e3a52d745a64b469f810b2cedbf", + "builtin-baseline":"94a541197763a4f449a1b91478df48c0584a6256", "overrides": [ - { "name": "blake3", "version": "1.5.4" }, - { "name": "faiss", "version": "1.8.0" } - ] + { "name": "blake3", "version": "1.8.7#0" }, + { "name": "faiss", "version": "1.14.3#0" }, + { "name": "blas", "version": "2023-04-14#6" }, + { "name": "clapack", "version": "3.2.1#25" }, + { "name": "lapack", "version": "2023-06-10#4" }, + { "name": "lapack-reference", "version": "3.12.1#3" }, + { "name": "openblas", "version": "0.3.33#0" } +] } \ No newline at end of file From 36a4d70133d1b95d61caa9b7927b9a902b5c4f8b Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 11:44:24 +0200 Subject: [PATCH 03/15] blacke to 1.8.6 --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 02581b6..a1c5358 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ ], "builtin-baseline":"94a541197763a4f449a1b91478df48c0584a6256", "overrides": [ - { "name": "blake3", "version": "1.8.7#0" }, + { "name": "blake3", "version": "1.8.6#0" }, { "name": "faiss", "version": "1.14.3#0" }, { "name": "blas", "version": "2023-04-14#6" }, { "name": "clapack", "version": "3.2.1#25" }, From 0443c4fe9a8aa6cd31c12d18839938a5cab9a033 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 12:38:23 +0200 Subject: [PATCH 04/15] Update mac vcpkg triplet to arm --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cbc7a49..2d07c2e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -111,7 +111,7 @@ def generate(self): vcpkg_triplet = "x64-windows" if self.settings.os == "Macos": - vcpkg_triplet = "x64-osx" + vcpkg_triplet = "arm64-osx" if self.settings.os == "Linux": vcpkg_triplet = "x64-linux" From bba758412756fc812006aa893e6841fb08b9c020 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 12:54:17 +0200 Subject: [PATCH 05/15] add libomp to mac on CI --- conanfile.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 2d07c2e..a48959e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -70,8 +70,13 @@ def configure(self): pass def system_requirements(self): - # May be needed for macOS or Linux - pass + if os_info.is_macos: + installer = SystemPackageTool() + installer.install("libomp") + proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) + subprocess.run(f"ln {proc.stdout.decode('UTF-8').strip()}/lib/libomp.dylib /usr/local/lib/libomp.dylib", shell=True) + if os_info.is_linux: + self.run("sudo apt update && sudo apt install -y libtbb-dev") def config_options(self): if self.settings.os == "Windows": @@ -103,6 +108,11 @@ def generate(self): tc.cache_variables["MV_UNITY_BUILD"] = "ON" tc.cache_variables["CMAKE_CONFIGURATION_TYPES"] = "RelWithDebInfo" + if os_info.is_macos: + proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) + prefix_path = f"{proc.stdout.decode('UTF-8').strip()}" + tc.variables["OpenMP_ROOT"] = prefix_path + # Use vcpkg-installed dependencies if there are any if os.environ.get("VCPKG_ROOT", None): vcpkg_dir = pathlib.Path(os.environ["VCPKG_ROOT"]) From b106bd34d54b56a8709e78e72fc50aa74315218f Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 12:59:02 +0200 Subject: [PATCH 06/15] add import in conanfile --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index a48959e..6879a44 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,6 +1,6 @@ from conans import ConanFile from conan.tools.cmake import CMakeDeps, CMake, CMakeToolchain -from conans.tools import save, load +from conans.tools import save, load, os_info, SystemPackageTool import os import pathlib import subprocess @@ -112,7 +112,7 @@ def generate(self): proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) prefix_path = f"{proc.stdout.decode('UTF-8').strip()}" tc.variables["OpenMP_ROOT"] = prefix_path - + # Use vcpkg-installed dependencies if there are any if os.environ.get("VCPKG_ROOT", None): vcpkg_dir = pathlib.Path(os.environ["VCPKG_ROOT"]) From 1482f1bb0d66f8c86b49459e01c378005803797b Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:07:49 +0200 Subject: [PATCH 07/15] find package openmp --- ExampleDependencies/CMakeLists.txt | 1 + conanfile.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index b7af799..1f099bc 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -41,6 +41,7 @@ set_target_properties(hwy_list_targets PROPERTIES EXCLUDE_FROM_ALL True) if(${MV_EXAMPLES_USE_VCPKG}) find_package(blake3 CONFIG REQUIRED) + find_package(OpenMP REQUIRED) find_package(faiss CONFIG REQUIRED) endif() diff --git a/conanfile.py b/conanfile.py index 6879a44..6a1f658 100644 --- a/conanfile.py +++ b/conanfile.py @@ -75,8 +75,6 @@ def system_requirements(self): installer.install("libomp") proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) subprocess.run(f"ln {proc.stdout.decode('UTF-8').strip()}/lib/libomp.dylib /usr/local/lib/libomp.dylib", shell=True) - if os_info.is_linux: - self.run("sudo apt update && sudo apt install -y libtbb-dev") def config_options(self): if self.settings.os == "Windows": From ae08d498ce0c347479107d235c5191e7eae9c8eb Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:11:13 +0200 Subject: [PATCH 08/15] Let vcpkg find omp on the CI on mac --- ExampleDependencies/CMakeLists.txt | 1 - conanfile.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 1f099bc..b7af799 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -41,7 +41,6 @@ set_target_properties(hwy_list_targets PROPERTIES EXCLUDE_FROM_ALL True) if(${MV_EXAMPLES_USE_VCPKG}) find_package(blake3 CONFIG REQUIRED) - find_package(OpenMP REQUIRED) find_package(faiss CONFIG REQUIRED) endif() diff --git a/conanfile.py b/conanfile.py index 6a1f658..10fd7f8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -110,6 +110,7 @@ def generate(self): proc = subprocess.run("brew --prefix libomp", shell=True, capture_output=True) prefix_path = f"{proc.stdout.decode('UTF-8').strip()}" tc.variables["OpenMP_ROOT"] = prefix_path + os.environ['OpenMP_ROOT'] = prefix_path # for vcpkg to find omp # Use vcpkg-installed dependencies if there are any if os.environ.get("VCPKG_ROOT", None): From 31c3cfdf08db8bdb0b78a9cf09ce9edee48a6dfd Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:31:26 +0200 Subject: [PATCH 09/15] Ensure openmp is always found before faiss --- ExampleDependencies/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index b7af799..1f099bc 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -41,6 +41,7 @@ set_target_properties(hwy_list_targets PROPERTIES EXCLUDE_FROM_ALL True) if(${MV_EXAMPLES_USE_VCPKG}) find_package(blake3 CONFIG REQUIRED) + find_package(OpenMP REQUIRED) find_package(faiss CONFIG REQUIRED) endif() From 91d877dff64c9dab5b48834a601f9f9c92140dc2 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:31:38 +0200 Subject: [PATCH 10/15] Be explicit about project variables --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b3fb92..22798c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif() # ExamplePlugins # ----------------------------------------------------------------------------- set(PROJECT "ExamplePlugins") -PROJECT(${PROJECT} C CXX) +PROJECT(${PROJECT} LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) From 2fc95059caaeaf72d4834e0f677965b9f7751d12 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:43:08 +0200 Subject: [PATCH 11/15] Compile faiss code on mac --- ExampleDependencies/src/ExampleDependenciesPlugin.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp index 85cce8c..914da58 100644 --- a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp +++ b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp @@ -14,14 +14,11 @@ #include #include -#if defined __USE_VCPKG__ +#ifdef __USE_VCPKG__ #include - -#if !defined(__APPLE__) #include using idx_t = faiss::idx_t; #endif -#endif Q_PLUGIN_METADATA(IID "studio.manivault.ExampleDependenciesPlugin") @@ -98,7 +95,7 @@ void ExampleDependenciesPlugin::compute() outputPoints->setData(data.data(), numPoints, numDims); events().notifyDatasetDataChanged(outputPoints); -#if defined __USE_VCPKG__ +#ifdef __USE_VCPKG__ std::cout << "ExampleDependenciesPlugin: Using blake version: " << blake3_version() << std::endl; // Create hash @@ -116,7 +113,6 @@ void ExampleDependenciesPlugin::compute() } printf("\n"); -#if !defined(__APPLE__) // find knn faiss::IndexFlatL2 index(numDims); // call constructor index.add(numPoints, data.data()); // add vectors to the index @@ -133,7 +129,6 @@ void ExampleDependenciesPlugin::compute() printf("%5zd ", I[i * k + j]); printf("\n"); } -#endif // __APPLE__ #endif // __USE_VCPKG__ std::cout << "ExampleDependenciesPlugin: Finished." << std::endl; From be59d2ade6c27b2f97db8def23092e41bdc329c0 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:43:16 +0200 Subject: [PATCH 12/15] Fix type warnings --- .../src/ExampleDependenciesPlugin.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp index 914da58..acdfbfc 100644 --- a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp +++ b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp @@ -6,9 +6,9 @@ #include #include +#include #include #include -#include #include #include @@ -55,12 +55,12 @@ void ExampleDependenciesPlugin::init() void ExampleDependenciesPlugin::compute() { - std::cout << "ExampleDependenciesPlugin: Starting..." << std::endl; + std::cout << "ExampleDependenciesPlugin: Starting.../n" << std::endl; - auto printData = [](const std::vector& vec, size_t dims, size_t points) { - for (size_t dim = 0; dim < dims; dim++) + auto printData = [](const std::vector& vec, const idx_t dims, const idx_t points) { + for (idx_t dim = 0; dim < dims; dim++) { - for (size_t point = 0; point < points; point++) + for (idx_t point = 0; point < points; point++) std::cout << vec[point + points * dim] << " "; std::cout << std::endl; } @@ -68,8 +68,8 @@ void ExampleDependenciesPlugin::compute() // Get input data const auto inputPoints = getInputDataset(); - const size_t numDims = inputPoints->getNumDimensions(); - const size_t numPoints = inputPoints->getNumPoints(); + const auto numDims = static_cast(inputPoints->getNumDimensions()); + const auto numPoints = static_cast(inputPoints->getNumPoints()); std::vector data; std::vector dimensionIndices(numDims); @@ -81,9 +81,9 @@ void ExampleDependenciesPlugin::compute() std::cout << "ExampleDependenciesPlugin: Data before sorting" << std::endl; printData(data, numDims, numPoints); - for (size_t dim = 0; dim < numDims; dim++) + for (idx_t dim = 0; dim < numDims; dim++) { - size_t offset = numPoints * dim; + idx_t offset = numPoints * dim; hwy::VQSort(data.data() + offset, numPoints, hwy::SortAscending{}); } @@ -117,15 +117,15 @@ void ExampleDependenciesPlugin::compute() faiss::IndexFlatL2 index(numDims); // call constructor index.add(numPoints, data.data()); // add vectors to the index - int k = std::max(static_cast(5), numPoints); + const idx_t k = std::max(static_cast(5), numPoints); std::vector I(k * numPoints); std::vector D(k * numPoints); index.search(numPoints, data.data(), k, D.data(), I.data()); printf("knn results\n"); - for (size_t i = 0; i < numPoints; i++) { - for (int j = 0; j < k; j++) + for (idx_t i = 0; i < numPoints; i++) { + for (idx_t j = 0; j < k; j++) printf("%5zd ", I[i * k + j]); printf("\n"); } From 354888c5a58c2ea593b3175dcf911618efcb0870 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:52:42 +0200 Subject: [PATCH 13/15] Fix non-vcpkg build --- .../src/ExampleDependenciesPlugin.cpp | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp index acdfbfc..165c190 100644 --- a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp +++ b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp @@ -17,7 +17,6 @@ #ifdef __USE_VCPKG__ #include #include -using idx_t = faiss::idx_t; #endif Q_PLUGIN_METADATA(IID "studio.manivault.ExampleDependenciesPlugin") @@ -57,10 +56,10 @@ void ExampleDependenciesPlugin::compute() { std::cout << "ExampleDependenciesPlugin: Starting.../n" << std::endl; - auto printData = [](const std::vector& vec, const idx_t dims, const idx_t points) { - for (idx_t dim = 0; dim < dims; dim++) + auto printData = [](const std::vector& vec, const int64_t dims, const int64_t points) { + for (int64_t dim = 0; dim < dims; dim++) { - for (idx_t point = 0; point < points; point++) + for (int64_t point = 0; point < points; point++) std::cout << vec[point + points * dim] << " "; std::cout << std::endl; } @@ -68,8 +67,8 @@ void ExampleDependenciesPlugin::compute() // Get input data const auto inputPoints = getInputDataset(); - const auto numDims = static_cast(inputPoints->getNumDimensions()); - const auto numPoints = static_cast(inputPoints->getNumPoints()); + const auto numDims = static_cast(inputPoints->getNumDimensions()); + const auto numPoints = static_cast(inputPoints->getNumPoints()); std::vector data; std::vector dimensionIndices(numDims); @@ -81,9 +80,9 @@ void ExampleDependenciesPlugin::compute() std::cout << "ExampleDependenciesPlugin: Data before sorting" << std::endl; printData(data, numDims, numPoints); - for (idx_t dim = 0; dim < numDims; dim++) + for (int64_t dim = 0; dim < numDims; dim++) { - idx_t offset = numPoints * dim; + int64_t offset = numPoints * dim; hwy::VQSort(data.data() + offset, numPoints, hwy::SortAscending{}); } @@ -117,15 +116,15 @@ void ExampleDependenciesPlugin::compute() faiss::IndexFlatL2 index(numDims); // call constructor index.add(numPoints, data.data()); // add vectors to the index - const idx_t k = std::max(static_cast(5), numPoints); - std::vector I(k * numPoints); + const int64_t k = std::max(static_cast(5), numPoints); + std::vector I(k * numPoints); std::vector D(k * numPoints); index.search(numPoints, data.data(), k, D.data(), I.data()); printf("knn results\n"); - for (idx_t i = 0; i < numPoints; i++) { - for (idx_t j = 0; j < k; j++) + for (int64_t i = 0; i < numPoints; i++) { + for (int64_t j = 0; j < k; j++) printf("%5zd ", I[i * k + j]); printf("\n"); } From 1ea34ea81c3ce6232b143e45f90a4259f7261276 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:52:53 +0200 Subject: [PATCH 14/15] Set vcpkg build ON on CI --- conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conanfile.py b/conanfile.py index 10fd7f8..3a7a11d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -136,6 +136,8 @@ def generate(self): tc.variables["CMAKE_PROJECT_INCLUDE"] = vcpkg_tc.as_posix() + tc.cache_variables["MV_EXAMPLES_USE_VCPKG"] = "ON" + tc.generate() def _configure_cmake(self): From 6488ddd483cae15079633928f039a59e152c7fc3 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 9 Oct 2026 13:58:29 +0200 Subject: [PATCH 15/15] More fine-grained compilation guard name --- ExampleDependencies/CMakeLists.txt | 2 +- ExampleDependencies/src/ExampleDependenciesPlugin.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 1f099bc..4a1d013 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -105,7 +105,7 @@ if(${MV_EXAMPLES_USE_VCPKG}) target_link_libraries(${PROJECT_NAME} PRIVATE BLAKE3::blake3) target_link_libraries(${PROJECT_NAME} PRIVATE faiss) - target_compile_definitions (${PROJECT_NAME} PRIVATE __USE_VCPKG__) + target_compile_definitions (${PROJECT_NAME} PRIVATE __MV_EXAMPLES_USE_VCPKG__) endif() # Not used here, but you can use this in your plugin diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp index 165c190..3a7ab26 100644 --- a/ExampleDependencies/src/ExampleDependenciesPlugin.cpp +++ b/ExampleDependencies/src/ExampleDependenciesPlugin.cpp @@ -14,7 +14,7 @@ #include #include -#ifdef __USE_VCPKG__ +#ifdef __MV_EXAMPLES_USE_VCPKG__ #include #include #endif @@ -94,7 +94,7 @@ void ExampleDependenciesPlugin::compute() outputPoints->setData(data.data(), numPoints, numDims); events().notifyDatasetDataChanged(outputPoints); -#ifdef __USE_VCPKG__ +#ifdef __MV_EXAMPLES_USE_VCPKG__ std::cout << "ExampleDependenciesPlugin: Using blake version: " << blake3_version() << std::endl; // Create hash @@ -128,7 +128,7 @@ void ExampleDependenciesPlugin::compute() printf("%5zd ", I[i * k + j]); printf("\n"); } -#endif // __USE_VCPKG__ +#endif // __MV_EXAMPLES_USE_VCPKG__ std::cout << "ExampleDependenciesPlugin: Finished." << std::endl; }