From 07ecb5e7d645688ac045f4fa68f70c0d92c42866 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Thu, 24 Oct 2024 11:36:14 -0400 Subject: [PATCH] Allow overriding CMAKE_CXX_COMPILER (#436) Using set as-is doesn't allow the user to set their own rocm path. This is useful for community packagers or debugging. Signed-off-by: Jeremy Newton --- CMakeLists.txt | 2 +- samples/videoDecode/CMakeLists.txt | 2 +- samples/videoDecodeBatch/CMakeLists.txt | 2 +- samples/videoDecodeMem/CMakeLists.txt | 2 +- samples/videoDecodeMultiFiles/CMakeLists.txt | 2 +- samples/videoDecodePerf/CMakeLists.txt | 2 +- samples/videoDecodeRGB/CMakeLists.txt | 2 +- samples/videoToSequence/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 904dfcab71..2d6ef9e0c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ message("-- ${BoldBlue}rocDecode Install Path -- ${CMAKE_INSTALL_PREFIX}${Colour list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode Build Type if(NOT CMAKE_BUILD_TYPE) diff --git a/samples/videoDecode/CMakeLists.txt b/samples/videoDecode/CMakeLists.txt index 0f40f91044..b1e56ae8eb 100644 --- a/samples/videoDecode/CMakeLists.txt +++ b/samples/videoDecode/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeBatch/CMakeLists.txt b/samples/videoDecodeBatch/CMakeLists.txt index 322112a52f..0f12f5dead 100644 --- a/samples/videoDecodeBatch/CMakeLists.txt +++ b/samples/videoDecodeBatch/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeMem/CMakeLists.txt b/samples/videoDecodeMem/CMakeLists.txt index bf576f5205..b65b0b3fae 100644 --- a/samples/videoDecodeMem/CMakeLists.txt +++ b/samples/videoDecodeMem/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeMultiFiles/CMakeLists.txt b/samples/videoDecodeMultiFiles/CMakeLists.txt index d24770cfb1..78f3281248 100644 --- a/samples/videoDecodeMultiFiles/CMakeLists.txt +++ b/samples/videoDecodeMultiFiles/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt index c5cf40f3f7..6fa54086cf 100644 --- a/samples/videoDecodePerf/CMakeLists.txt +++ b/samples/videoDecodePerf/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoDecodeRGB/CMakeLists.txt b/samples/videoDecodeRGB/CMakeLists.txt index 6610382a37..8a2bfd8647 100644 --- a/samples/videoDecodeRGB/CMakeLists.txt +++ b/samples/videoDecodeRGB/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/samples/videoToSequence/CMakeLists.txt b/samples/videoToSequence/CMakeLists.txt index 09964f1e1d..ccf52293f3 100644 --- a/samples/videoToSequence/CMakeLists.txt +++ b/samples/videoToSequence/CMakeLists.txt @@ -36,7 +36,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) -set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++) +set(CMAKE_CXX_COMPILER ${ROCM_PATH}/lib/llvm/bin/clang++ CACHE STRING "ROCm Compiler path") # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release")