File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff 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} )
You can’t perform that action at this time.
0 commit comments