dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-02 22:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'adsp-on-linux'

Browse Source 
33e6862cbc ADSP: Allow progress with CMAKE_ADSP_ROOT unset
85e25451af ADSP: Add /opt/analog/cces to  _find_adsp_root()'s search space
04d8a39e5c ADSP: Use find_program() to get path to cc21k/ccblkfn
7883178cae ADSP: Use $CMAKE_EXECUTABLE_SUFFIX in COMPILER_NAME

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9016
This commit is contained in:
Brad King
2023-12-01 14:05:36 +00:00
committed by Kitware Robot
parent b52f824577 33e6862cbc
commit ce0835beee
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/Platform/ADSP-Common.cmake
View File

@@ -9,9 +9,9 @@ macro(__platform_adsp_init)
set(CMAKE_ADSP_PROCESSOR "ADSP-${CMAKE_SYSTEM_PROCESSOR}")
string(TOUPPER "${CMAKE_ADSP_PROCESSOR}" CMAKE_ADSP_PROCESSOR)
set(CMAKE_ADSP_COMPILER_NAME cc21k.exe)
set(CMAKE_ADSP_COMPILER_NAME "cc21k${CMAKE_EXECUTABLE_SUFFIX}")
if(CMAKE_ADSP_PROCESSOR MATCHES "^ADSP-BF")
set(CMAKE_ADSP_COMPILER_NAME ccblkfn.exe)
set(CMAKE_ADSP_COMPILER_NAME "ccblkfn${CMAKE_EXECUTABLE_SUFFIX}")
endif()
set(CMAKE_ADSP_PLATFORM_INITIALIZED TRUE)
@@ -20,7 +20,12 @@ endmacro()
macro(__platform_adsp lang)
__platform_adsp_init()
set(CMAKE_${lang}_COMPILER "${CMAKE_ADSP_ROOT}/${CMAKE_ADSP_COMPILER_NAME}")
find_program(
CMAKE_${lang}_COMPILER
"${CMAKE_ADSP_COMPILER_NAME}"
PATHS "${CMAKE_ADSP_ROOT}"
REQUIRED
)
execute_process(
COMMAND "${CMAKE_${lang}_COMPILER}" "-proc=${CMAKE_ADSP_PROCESSOR}" "-version"

4
Modules/Platform/ADSP-Determine.cmake
View File

@@ -21,6 +21,6 @@ endif()
if(NOT CMAKE_ADSP_ROOT)
_find_adsp_root("C:/Program Files (x86)/Analog Devices/VisualDSP *")
endif()
if(NOT IS_DIRECTORY "${CMAKE_ADSP_ROOT}")
message(FATAL_ERROR "ADSP: could not find CCES/VDSP++ install directory ${CMAKE_ADSP_ROOT}")
if(NOT CMAKE_ADSP_ROOT)
_find_adsp_root("/opt/analog/cces *")
endif()