commit 8188adf98b25dca90112d4dbe7a15b356d800a2b
author Graham Sanderson <graham.sanderson@raspberrypi.com> Tue Jun 06 10:46:17 2023 -0500
committer GitHub <noreply@github.com> Tue Jun 06 10:46:17 2023 -0500
tree 05aeb314419fa9980e34388822243b66a025907c
parent 5d47872cb47980c4bdb8bd0c83e8fd77a72cd9ce

avoid calling find_package for pico-sdk-tools over and over again (#1403)

tools/CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 41ab296..1b1cbc9 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,11 +1,14 @@
 function(_pico_init_pioasm)
-    # Assemble the version string from components instead of using PICO_SDK_VERSION_STRING, because the version string
-    # potentially has a PRE_RELEASE_ID suffix, which will trip up the find_package call.
-    find_package(pico-sdk-tools "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}.${PICO_SDK_VERSION_REVISION}" QUIET CONFIG CMAKE_FIND_ROOT_PATH_BOTH)
     if (NOT Pioasm_FOUND)
-        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PICO_SDK_PATH}/tools)
-        # todo CMAKE_CURRENT_FUNCTION_LIST_DIR ... what version?
-        find_package(Pioasm REQUIRED)
+        # Assemble the version string from components instead of using PICO_SDK_VERSION_STRING, because the version string
+        # potentially has a PRE_RELEASE_ID suffix, which will trip up the find_package call.
+        find_package(pico-sdk-tools "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}.${PICO_SDK_VERSION_REVISION}" QUIET CONFIG CMAKE_FIND_ROOT_PATH_BOTH)
+
+        if (NOT Pioasm_FOUND)
+            set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PICO_SDK_PATH}/tools)
+            # todo CMAKE_CURRENT_FUNCTION_LIST_DIR ... what version?
+            find_package(Pioasm REQUIRED)
+        endif()
     endif()
 endfunction()
 
@@ -58,10 +61,12 @@
     else()
         set(output_path "")
     endif()
-    find_package(pico-sdk-tools "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}.${PICO_SDK_VERSION_REVISION}" QUIET CONFIG CMAKE_FIND_ROOT_PATH_BOTH)
     if (NOT ELF2UF2_FOUND)
-        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PICO_SDK_PATH}/tools)
-        find_package(ELF2UF2)
+        find_package(pico-sdk-tools "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}.${PICO_SDK_VERSION_REVISION}" QUIET CONFIG CMAKE_FIND_ROOT_PATH_BOTH)
+        if (NOT ELF2UF2_FOUND)
+            set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PICO_SDK_PATH}/tools)
+            find_package(ELF2UF2)
+        endif()
     endif()
     if (ELF2UF2_FOUND)
         add_custom_command(TARGET ${TARGET} POST_BUILD