Skip to content

Commit

Permalink
Use official Conan packages
Browse files Browse the repository at this point in the history
- Download both Boost and Conan from official maintainers
- Apply C++11 support by property on CMake

Signed-off-by: Uilian Ries <[email protected]>
  • Loading branch information
uilianries committed Jul 13, 2018
1 parent a8fe68c commit 25c9f08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.0.2)
project(four_c)

if(EXISTS ${CMAKE_SOURCE_DIR}/.conan/conanbuildinfo.cmake)
Expand All @@ -8,6 +8,6 @@ else()
endif()
conan_basic_setup()

add_compile_options(-std=c++11)
add_executable(timer timer.cpp)
target_link_libraries(timer ${CONAN_LIBS})
set_property(TARGET timer PROPERTY CXX_STANDARD 11)
4 changes: 2 additions & 2 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[requires]
Poco/1.7.2@lasote/stable
Boost/1.60.0@lasote/stable
Poco/1.9.0@pocoproject/stable
boost/1.67.0@conan/stable

[generators]
cmake
Expand Down

0 comments on commit 25c9f08

Please sign in to comment.