From 0435dc5670f10ef5463e502d079fb6fb7aa30777 Mon Sep 17 00:00:00 2001 From: Timor Gruber Date: Mon, 17 Jun 2019 22:28:02 +0300 Subject: [PATCH] Cleared cache at beginning of `find_arduino_library` function --- cmake/Platform/Libraries/LibrariesFinder.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/Platform/Libraries/LibrariesFinder.cmake b/cmake/Platform/Libraries/LibrariesFinder.cmake index b9bf4a1..85700d1 100644 --- a/cmake/Platform/Libraries/LibrariesFinder.cmake +++ b/cmake/Platform/Libraries/LibrariesFinder.cmake @@ -1,4 +1,4 @@ -macro(_cleanup_find_arduino_library) +macro(_clear_find_library_state) unset(library_path CACHE) @@ -18,6 +18,10 @@ endmacro() #=============================================================================# function(find_arduino_library _target_name _library_name) + + _clear_find_library_state() + + set(argument_options "3RD_PARTY" "HEADER_ONLY" "QUIET") cmake_parse_arguments(parsed_args "${argument_options}" "" "" ${ARGN}) @@ -28,7 +32,7 @@ function(find_arduino_library _target_name _library_name) endif () find_file(library_path - NAMES ${_library_name} + NAMES "${_library_name}" PATHS ${ARDUINO_CMAKE_PLATFORM_LIBRARIES_PATH} ${ARDUINO_SDK_LIBRARIES_PATH} ${ARDUINO_CMAKE_SKETCHBOOK_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR} PATH_SUFFIXES libraries dependencies @@ -43,7 +47,7 @@ function(find_arduino_library _target_name _library_name) if (NOT library_headers) if (parsed_args_QUIET) - _cleanup_find_arduino_library() + _clear_find_library_state() return() else () message(SEND_ERROR "Couldn't find any header files for the " @@ -57,7 +61,7 @@ function(find_arduino_library _target_name _library_name) if (NOT library_sources) if (parsed_args_QUIET) - _cleanup_find_arduino_library() + _clear_find_library_state() return() else () message(SEND_ERROR "Couldn't find any source files for the " @@ -78,6 +82,6 @@ function(find_arduino_library _target_name _library_name) endif () endif () - _cleanup_find_arduino_library() + _clear_find_library_state() endfunction()