Skip to content

Commit

Permalink
Exclude Windows from stress-benchmark (uses 'fork') + fix copy-folder.
Browse files Browse the repository at this point in the history
done as part of CURA-11378
  • Loading branch information
rburema committed Nov 28, 2023
1 parent 9809416 commit edffb97
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit edffb97

Please sign in to comment.