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