From 33e6862cbcb8002ce82cd1420a2197af5b56cfbb Mon Sep 17 00:00:00 2001 From: Josh Channings Date: Wed, 29 Nov 2023 19:01:27 +0000 Subject: ADSP: Allow progress with CMAKE_ADSP_ROOT unset This is a behavior change. You can still set ADSP_ROOT/CMAKE_ADSP_ROOT to hint the find_program() invocations for the CCES binaries, but it is no longer necessary if they are already in PATH. The reason is: CMAKE_ADSP_ROOT is only used to find the binaries. If they are in PATH, there is no need to supply the root path. If they are not in PATH, you can hint still hint it as before. The other option would be to use find_path() to get CMAKE_ADSP_ROOT from the path to one of the bins, but that would be convoluted and pointless. There are some circumstances where the binaries are available, but the ADSP install is not. For example, from my own dev environment: https://github.com/joshchngs/macos-sharc-tools Here, the `cc21k` et. al. binaries are actually shell scripts which launch the real binary inside a running VM. --- Modules/Platform/ADSP-Determine.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/Modules/Platform/ADSP-Determine.cmake b/Modules/Platform/ADSP-Determine.cmake index d5a34c5..1588c92 100644 --- a/Modules/Platform/ADSP-Determine.cmake +++ b/Modules/Platform/ADSP-Determine.cmake @@ -24,6 +24,3 @@ endif() if(NOT CMAKE_ADSP_ROOT) _find_adsp_root("/opt/analog/cces *") endif() -if(NOT IS_DIRECTORY "${CMAKE_ADSP_ROOT}") - message(FATAL_ERROR "ADSP: could not find CCES/VDSP++ install directory ${CMAKE_ADSP_ROOT}") -endif() -- cgit v0.12