From 2eb3bd30efcae0a0819e11b61b55c15176f2662b Mon Sep 17 00:00:00 2001 From: Kiriti Gowda Date: Mon, 2 Dec 2024 13:02:09 -0800 Subject: [PATCH] Compiler - set CXX Compiler if not set (#466) [ROCm/rocdecode commit: 7a6073103ad331c0ae84a58765929e55cc679054] --- projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt | 5 ++++- projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt | 5 ++++- .../rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt | 5 ++++- projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt | 5 ++++- projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt | 5 ++++- projects/rocdecode/samples/videoToSequence/CMakeLists.txt | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt b/projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt index d4458d1557..9cba988031 100644 --- a/projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt +++ b/projects/rocdecode/samples/videoDecodeBatch/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt b/projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt index c0eb2865c6..89001bf132 100644 --- a/projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt +++ b/projects/rocdecode/samples/videoDecodeMem/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/projects/rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt b/projects/rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt index 2b9e90c7b2..f9dd18e4fb 100644 --- a/projects/rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt +++ b/projects/rocdecode/samples/videoDecodeMultiFiles/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt b/projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt index d79dd765e6..7b0e219af3 100644 --- a/projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt +++ b/projects/rocdecode/samples/videoDecodePerf/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt b/projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt index 0c976d4ae2..c6b37065cd 100644 --- a/projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt +++ b/projects/rocdecode/samples/videoDecodeRGB/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release") diff --git a/projects/rocdecode/samples/videoToSequence/CMakeLists.txt b/projects/rocdecode/samples/videoToSequence/CMakeLists.txt index 0b8dd1b039..636ae762fc 100644 --- a/projects/rocdecode/samples/videoToSequence/CMakeLists.txt +++ b/projects/rocdecode/samples/videoToSequence/CMakeLists.txt @@ -36,7 +36,10 @@ 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}/bin/amdclang++) +# Set AMD Clang as default compiler +if (NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) +endif() # rocDecode sample build type set(DEFAULT_BUILD_TYPE "Release")