Merge pull request #13 from aminya/fix-conan-options

aminya · Oct 23, 2021 · 7c2cfcd · 7c2cfcd
2 parents 6e98aa8 + 3496a2c
commit 7c2cfcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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})