From edffb9762ead06e0ef543bf778ae281dcb62487b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 28 Nov 2023 13:32:19 +0100 Subject: [PATCH] Exclude Windows from stress-benchmark (uses 'fork') + fix copy-folder. done as part of CURA-11378 --- CMakeLists.txt | 4 +++- conanfile.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82b2319188..5f69116126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,7 +274,9 @@ endif () if (ENABLE_BENCHMARKS) add_subdirectory(benchmark) - add_subdirectory(stress_benchmark) + if (NOT WIN32) + add_subdirectory(stress_benchmark) + endif() endif () if (ENABLE_TESTING) diff --git a/conanfile.py b/conanfile.py index 5764da2ff0..1a606e0fb1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -51,7 +51,8 @@ def export_sources(self): copy(self, "*", path.join(self.recipe_folder, "src"), path.join(self.export_sources_folder, "src")) copy(self, "*", path.join(self.recipe_folder, "include"), path.join(self.export_sources_folder, "include")) copy(self, "*", path.join(self.recipe_folder, "benchmark"), path.join(self.export_sources_folder, "benchmark")) - copy(self, "*", path.join(self.recipe_folder, "stress_benchmark"), path.join(self.export_sources_folder, "benchmark")) + if self.settings.os != "Windows": + copy(self, "*", path.join(self.recipe_folder, "stress_benchmark"), path.join(self.export_sources_folder, "stress_benchmark")) copy(self, "*", path.join(self.recipe_folder, "tests"), path.join(self.export_sources_folder, "tests")) def config_options(self):