updated versions

memsharded · May 10, 2016 · d68f0d4 · d68f0d4
1 parent 7c24a69
commit d68f0d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,5 @@
 
 build/
 .idea
-*~
+*~
+.conan
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 2.8)
-
 project(four_c)
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build/conanbuildinfo.cmake) #Clion, with conanbuildinfo.cmake in build folder
-    include(${CMAKE_CURRENT_SOURCE_DIR}/build/conanbuildinfo.cmake)
+if(EXISTS ${CMAKE_SOURCE_DIR}/.conan/conanbuildinfo.cmake)
+    include(${CMAKE_SOURCE_DIR}/.conan/conanbuildinfo.cmake)
 else()
-    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) # Not CLion
+    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 endif()
 conan_basic_setup()
 
 add_compile_options(-std=c++11)
 add_executable(timer timer.cpp)
-target_link_libraries(timer ${CONAN_LIBS})
+target_link_libraries(timer ${CONAN_LIBS})
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ First, we have to make sure that we are using the Clang compiler, so packages th
 $ export CC=clang-3.6
 $ export CXX=clang++-3.6
 // For boost to work
-$ sudo ln -s /usr/bin/clang++-3.6 /usr/bin/clang++
+$ sudo ln -s /usr/bin/clang++-3.6 /usr/local/bin/clang++
 ```
 
 Now we are ready to install all the dependencies. It is retrieving and building Boost, Poco and its

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,6 +1,6 @@
 [requires]
-Poco/1.6.1@lasote/stable
-Boost/1.60.0@memsharded/stable
+Poco/1.7.2@lasote/stable
+Boost/1.60.0@lasote/stable
 
 [generators]
 cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,5 @@ @@
     build/
     .idea
-    *~
+    *~
+    .conan