From 4c019887a8b6dfa190ff56e2400d37bde5f0b2e9 Mon Sep 17 00:00:00 2001 From: xbreak Date: Mon, 30 Oct 2017 10:02:52 +0000 Subject: [PATCH 1/3] conanbuildinfo.cmake requires v2.8.12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7159add..905c80a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ +cmake_minimum_required(VERSION 2.8.12) PROJECT(conanpoco) -cmake_minimum_required(VERSION 2.8) include(${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake) CONAN_BASIC_SETUP() From a67d72dfe3770bfbd1395a5d022c22d2c49a92f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Sat, 4 Nov 2017 14:19:48 +0100 Subject: [PATCH 2/3] fix README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 516623a..b3a57ad 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you handle multiple dependencies in your project is better to add a *conanfil txt cmake -Complete the installation of requirements for your project running: +Complete the installation of requirements for your project running: conan install . From 8ae254ba5d92418660c9bbae1dc0d16cc05448de Mon Sep 17 00:00:00 2001 From: memsharded Date: Mon, 2 Apr 2018 19:22:34 +0200 Subject: [PATCH 3/3] enabling local flow --- CMakeLists.txt | 2 +- conanfile.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 905c80a..7722e34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.12) PROJECT(conanpoco) -include(${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake) +include(${CMAKE_BINARY_DIR}/../conanbuildinfo.cmake) CONAN_BASIC_SETUP() diff --git a/conanfile.py b/conanfile.py index 213965e..efb6c64 100644 --- a/conanfile.py +++ b/conanfile.py @@ -114,8 +114,7 @@ def build(self): if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio": # MT or MTd cmake.definitions["POCO_MT"] = "ON" if "MT" in str(self.settings.compiler.runtime) else "OFF" self.output.info(cmake.definitions) - os.mkdir("build") - cmake.configure(source_dir="../poco", build_dir="build") + cmake.configure(source_folder="poco", build_folder="build") cmake.build() def package(self):