From d781322a8e39475fd2aff433262f0b4a2ee1beed Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 9 Apr 2019 13:33:59 +0200 Subject: [PATCH] CONAN_RUN_TESTS support added --- .travis.yml | 1 + conanfile.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f2f2e28..7734d439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ env: global: + - CONAN_RUN_TESTS: 1 - CONAN_DOCKER_32_IMAGES: 1 linux: &linux diff --git a/conanfile.py b/conanfile.py index 07e515ba..ba92ad6c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,10 @@ class UnitsConan(ConanFile): def _configure_cmake(self): cmake = CMake(self) - cmake.configure(source_dir="%s/src" % self.source_folder) + if tools.get_env("CONAN_RUN_TESTS", False): + cmake.configure() + else: + cmake.configure(source_dir="%s/src" % self.source_folder) return cmake def build(self):