Skip to content

Commit

Permalink
Merge branch 'release/0.10' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded committed Mar 30, 2018
2 parents 8416d22 + 3a2d836 commit eaae2d4
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ project(myproject CXX)
# Download automatically, you can also just copy the conan.cmake file
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/v0.8/conan.cmake"
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/v0.10/conan.cmake"
"${CMAKE_BINARY_DIR}/conan.cmake")
endif()
Expand Down Expand Up @@ -125,6 +125,16 @@ Use it to use the default conan profile rather than inferring settings from CMak

To use the [cmake_multi](http://docs.conan.io/en/latest/integrations/cmake.html#cmake-multi-configuration-environments) generator you just need to make sure ``CMAKE_BUILD_TYPE`` is empty and use a CMake generator that supports multi-configuration.


### SETTINGS
```cmake
include(conan.cmake)
conan_cmake_run(...
SETTINGS arch=armv6
SETTINGS cppstd=14)
```


## Creating packages

This cmake wrapper launchs conan, installing dependencies, and injecting a ``conan_basic_setup()`` call. So it is for end-users only, but not necessary at all for creating packages, because conan already downloaded and installed dependencies the moment that a package needs to be built. So if you are using the same CMakeLists.txt for both consuming and creating packages, consider doing something like:
Expand Down

0 comments on commit eaae2d4

Please sign in to comment.