Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import re
import os
import re

from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps
from conan.tools.files import load, copy
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain
from conan.tools.files import copy, load


class ScopeguardConan(ConanFile):
Expand Down Expand Up @@ -56,7 +57,7 @@ def set_version(self):

def requirements(self):
if self.options.unittest:
self.requires("catch2/3.15.1")
self.requires("catch2/3.15.2")
self.requires("trompeloeil/49")

def generate(self):
Expand Down