Merge branch 'master' into nitanmarcel/api_update_pr

1 files changed, 0 insertions, 24 deletions

diff --git a/samples/echobot-conan/conanfile.py b/samples/echobot-conan/conanfile.py
deleted file mode 100644
index 732b9b8..0000000
--- a/samples/echobot-conan/conanfile.py
+++ /dev/null
@@ -1,24 +0,0 @@
-
-import os
-from conans import ConanFile, CMake, tools
-
-
-class TestConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
-
-    def build(self):
-        cmake = CMake(self)
-        # Current dir is "echobot-conan/build/<build_id>" and CMakeLists.txt is in "echobot-conan"
-        cmake.configure()
-        cmake.build()
-
-    def imports(self):
-        self.copy("*.dll", dst="bin", src="bin")
-        self.copy("*.dylib*", dst="bin", src="lib")
-        self.copy('*.so*', dst='bin', src='lib')
-
-    def test(self):
-        if not tools.cross_building(self.settings):
-            os.chdir("bin")
-            self.run(".%sexample" % os.sep)