Skip to content

Commit

Permalink
Merge pull request #1985 from ericLemanissier/patch-1
Browse files Browse the repository at this point in the history
ninja: allow any MSVC runtime when consuming ninja
  • Loading branch information
uilianries authored Jun 24, 2020
2 parents b607f04 + 939f90f commit 345f761
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions recipes/ninja/1.10.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ class NinjaConan(ConanFile):
_source_subfolder = "source_subfolder"
_cmake = None

def configure(self):
if self.settings.compiler == "Visual Studio":
if self.settings.compiler.runtime != "MT":
raise ConanInvalidConfiguration("Only MT MSVC runtime is supported")

def _configure_cmake(self):
if self._cmake:
return self._cmake
Expand All @@ -34,6 +29,9 @@ def source(self):
os.rename("ninja-%s" % self.version, self._source_subfolder)

def build(self):
if self.settings.compiler == "Visual Studio":
if self.settings.compiler.runtime != "MT":
raise ConanInvalidConfiguration("Only MT MSVC runtime is supported")
for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch)

Expand Down

0 comments on commit 345f761

Please sign in to comment.