Skip to content
This repository has been archived by the owner on Jul 1, 2021. It is now read-only.

Feature/local flow #14

Open
wants to merge 9 commits into
base: release/1.9.0
Choose a base branch
from
Open

Feature/local flow #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4c01988
conanbuildinfo.cmake requires v2.8.12
xbreak Oct 30, 2017
08f662a
Merge pull request #5 from xbreak/MinVer
obiltschnig Oct 30, 2017
dcb9aeb
Merge branch 'release/1.7.9p1'
obiltschnig Nov 4, 2017
a67d72d
fix README
obiltschnig Nov 4, 2017
5e4ba28
Merge branch 'release/1.7.9p2'
obiltschnig Nov 7, 2017
c865ecf
Merge branch 'release/1.8.0'
obiltschnig Nov 10, 2017
6ac39fe
Merge branch 'release/1.9.0'
obiltschnig Mar 8, 2018
6c5b0ea
Merge branch 'release/1.9.0'
obiltschnig Mar 9, 2018
8ae254b
enabling local flow
memsharded Apr 2, 2018
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
PROJECT(conanpoco)
cmake_minimum_required(VERSION 2.8)
include(${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake)
include(${CMAKE_BINARY_DIR}/../conanbuildinfo.cmake)
CONAN_BASIC_SETUP()


Expand Down
3 changes: 1 addition & 2 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down