From 05efcdd46425a804e9bb8bec4702c073c5f7b03b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 26 Feb 2025 16:39:53 -0500 Subject: [PATCH] FindCUDA: Sync target directory table with FindCUDAToolkit The table has been duplicated since commit 69fcad9332 (CUDAToolkit: Add support for cross-compiling, 2020-01-21, v3.17.0-rc1~104^2~1). --- Modules/FindCUDA.cmake | 9 +++++---- Modules/FindCUDAToolkit.cmake | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 4323fda046..284726c4b0 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -891,21 +891,22 @@ endif () if(CMAKE_CROSSCOMPILING) set(CUDA_TOOLKIT_ROOT $ENV{CUDA_TOOLKIT_ROOT}) + # Keep in sync with equivalent table in FindCUDAToolkit! if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a") # Support for NVPACK - set (CUDA_TOOLKIT_TARGET_NAMES "armv7-linux-androideabi") + set(CUDA_TOOLKIT_TARGET_NAMES "armv7-linux-androideabi") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm") - # Support for arm cross compilation set(CUDA_TOOLKIT_TARGET_NAMES "armv7-linux-gnueabihf") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") - # Support for aarch64 cross compilation - if (ANDROID_ARCH_NAME STREQUAL "arm64") + if(ANDROID_ARCH_NAME STREQUAL "arm64") set(CUDA_TOOLKIT_TARGET_NAMES "aarch64-linux-androideabi") elseif (CMAKE_SYSTEM_NAME STREQUAL "QNX") set(CUDA_TOOLKIT_TARGET_NAMES "aarch64-qnx") else() set(CUDA_TOOLKIT_TARGET_NAMES "aarch64-linux" "sbsa-linux") endif() + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + set(CUDA_TOOLKIT_TARGET_NAMES "x86_64-linux") endif() foreach(CUDA_TOOLKIT_TARGET_NAME IN LISTS CUDA_TOOLKIT_TARGET_NAMES) diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index b10880dd81..6771af1d78 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -939,6 +939,7 @@ endif() # Find target directory when crosscompiling. if(CMAKE_CROSSCOMPILING) + # Keep in sync with equivalent table in FindCUDA! if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a") # Support for NVPACK set(CUDAToolkit_TARGET_NAMES "armv7-linux-androideabi")