From 3496a2cfccff062ef137b275d59595a6a5a2ff5f Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 23 Oct 2021 15:52:02 -0500 Subject: [PATCH] fix: fix conan options --- src/Conan.cmake | 4 ++-- src/Index.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Conan.cmake b/src/Conan.cmake index 984f953c..dcd43bfb 100644 --- a/src/Conan.cmake +++ b/src/Conan.cmake @@ -1,4 +1,4 @@ -macro(run_conan options) +macro(run_conan) # 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") @@ -45,7 +45,7 @@ macro(run_conan options) PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing # Pass compile-time configured options into conan - OPTIONS ${options} + OPTIONS ${cmakelib_CONAN_OPTIONS} SETTINGS ${settings}) endforeach() diff --git a/src/Index.cmake b/src/Index.cmake index d04996c8..b19ea417 100644 --- a/src/Index.cmake +++ b/src/Index.cmake @@ -153,7 +153,7 @@ macro(cmakelib) if(${cmakelib_ENABLE_CONAN}) include("${CMAKELIB_SRC_DIR}/Conan.cmake") - run_conan(${cmakelib_CONAN_OPTIONS}) + run_conan() endif() if(${cmakelib_ENABLE_UNITY})