From 76e17b299884686bb006cb9224c803f894dbff85 Mon Sep 17 00:00:00 2001 From: sguionni Date: Tue, 30 Jul 2024 06:36:28 +0200 Subject: [PATCH] Fix CI --- lib/renderer/conanfile.py | 1 - lib/util/conanfile.py | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/renderer/conanfile.py b/lib/renderer/conanfile.py index bf4328fb4..2a5f0e64b 100644 --- a/lib/renderer/conanfile.py +++ b/lib/renderer/conanfile.py @@ -45,7 +45,6 @@ def build(self): def package(self): cmake = CMake(self) - cmake.ctest(["--output-on-failure"]) cmake.install() copy(self, "*.cmake", self.build_folder, self.package_folder) diff --git a/lib/util/conanfile.py b/lib/util/conanfile.py index f1dafd515..bcb9be77a 100644 --- a/lib/util/conanfile.py +++ b/lib/util/conanfile.py @@ -10,8 +10,8 @@ class VTXUtilRecipe(ConanFile): package_type = "library" settings = "os", "compiler", "build_type", "arch" - options = {"shared": [True, False], "fPIC": [True, False]} - default_options = {"shared": False, "fPIC": True} + options = {"shared": [True, False], "fPIC": [True, False], "test": [True, False]} + default_options = {"shared": False, "fPIC": True, "test": False} generators = "CMakeDeps", "CMakeToolchain" @@ -23,7 +23,7 @@ def requirements(self): self.requires("nlohmann_json/3.11.3", transitive_headers=True) self.requires("magic_enum/0.9.5", transitive_headers=True) self.requires("cpr/1.10.5", transitive_headers=True) - self.requires("catch2/3.6.0") + self.requires("catch2/3.6.0") def config_options(self): if self.settings.os == "Windows": @@ -39,11 +39,12 @@ def generate(self): def build(self): cmake = CMake(self) cmake.configure() - cmake.build() + cmake.build() + if self.options.test == True: + cmake.ctest(["--output-on-failure"]) def package(self): - cmake = CMake(self) - cmake.ctest(["--output-on-failure"]) + cmake = CMake(self) cmake.install() copy(self, "*.cmake", self.build_folder, self.package_folder)