Skip to content

Commit 4b6ae29

Browse files
committed
fix: #28
1 parent 225b6bf commit 4b6ae29

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

cmake/Conan.cmake

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,35 @@ if(${PROJECT_NAME}_ENABLE_CONAN)
1212
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
1313
message(
1414
STATUS
15-
"Downloading conan.cmake from https://github.com/conan-io/cmake-conan..."
15+
"Downloading conan.cmake from https://github.com/conan-io/cmake-conan..."
1616
)
17-
file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake"
17+
file(
18+
DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake"
1819
"${CMAKE_BINARY_DIR}/conan.cmake"
1920
)
2021
message(STATUS "Cmake-Conan downloaded succesfully.")
2122
endif()
2223

2324
include(${CMAKE_BINARY_DIR}/conan.cmake)
2425

25-
conan_add_remote(NAME bincrafters
26-
URL
27-
https://api.bintray.com/conan/bincrafters/public-conan
26+
conan_add_remote(
27+
NAME bincrafters
28+
URL
29+
https://api.bintray.com/conan/bincrafters/public-conan
2830
)
2931

3032
conan_cmake_run(
3133
REQUIRES
32-
${CONAN_REQUIRES}
34+
${${PROJECT_NAME}_CONAN_REQUIRES}
3335
OPTIONS
34-
${CONAN_OPTIONS}
36+
${${PROJECT_NAME}_CONAN_OPTIONS}
3537
BASIC_SETUP
36-
CMAKE_TARGETS # Individual targets to link to
38+
CMAKE_TARGETS # Individual targets to link to
3739
BUILD
38-
missing
40+
missing
3941
)
4042

43+
conan_basic_setup()
44+
4145
verbose_message("Conan is setup and all requires have been installed.")
4246
endif()

0 commit comments

Comments
 (0)