Skip to content

Commit 7c2cfcd

Browse files
authored
Merge pull request #13 from aminya/fix-conan-options
2 parents 6e98aa8 + 3496a2c commit 7c2cfcd

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/Conan.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
macro(run_conan options)
1+
macro(run_conan)
22
# Download automatically, you can also just copy the conan.cmake file
33
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
44
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
@@ -45,7 +45,7 @@ macro(run_conan options)
4545
PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR}
4646
BUILD missing
4747
# Pass compile-time configured options into conan
48-
OPTIONS ${options}
48+
OPTIONS ${cmakelib_CONAN_OPTIONS}
4949
SETTINGS ${settings})
5050
endforeach()
5151

src/Index.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ macro(cmakelib)
153153

154154
if(${cmakelib_ENABLE_CONAN})
155155
include("${CMAKELIB_SRC_DIR}/Conan.cmake")
156-
run_conan(${cmakelib_CONAN_OPTIONS})
156+
run_conan()
157157
endif()
158158

159159
if(${cmakelib_ENABLE_UNITY})

0 commit comments

Comments
 (0)