From ede73e4f1dbfadb548e87ace27f29462675c4320 Mon Sep 17 00:00:00 2001 From: Kiriti Gowda Date: Wed, 23 Apr 2025 14:33:03 -0700 Subject: [PATCH] CMakeLists - Fix CXX Std (#145) [ROCm/rocjpeg commit: 40ac43a45766bff0d91dfc71581c92318470eec5] --- projects/rocjpeg/CMakeLists.txt | 11 ++++++----- projects/rocjpeg/samples/jpegDecode/CMakeLists.txt | 7 ++++--- .../rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt | 7 ++++--- .../rocjpeg/samples/jpegDecodePerf/CMakeLists.txt | 7 ++++--- projects/rocjpeg/test/CMakeLists.txt | 7 ++++--- .../test/rocjpeg_negative_api_tests/CMakeLists.txt | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/projects/rocjpeg/CMakeLists.txt b/projects/rocjpeg/CMakeLists.txt index 65032747f2..da3ff53e58 100644 --- a/projects/rocjpeg/CMakeLists.txt +++ b/projects/rocjpeg/CMakeLists.txt @@ -32,16 +32,17 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path") endif() # Set AMD Clang as default compiler +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS ON) if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) # rocJPEG Version # NOTE: package version and rocjpeg_version.h is generated with this version -set(VERSION "0.11.1") +set(VERSION "0.11.2") # Set Project Version and Language project(rocjpeg VERSION ${VERSION} LANGUAGES CXX) @@ -172,8 +173,8 @@ if(HIP_FOUND AND Libva_FOUND) file(GLOB_RECURSE SOURCES "./src/*.cpp") # rocJPEG.so add_library(${PROJECT_NAME} SHARED ${SOURCES}) - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -Wall") + # --all-warnings/-Wall -- Enable most warning messages + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARY_LIST}) set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/projects/rocjpeg/samples/jpegDecode/CMakeLists.txt b/projects/rocjpeg/samples/jpegDecode/CMakeLists.txt index dda66d53f5..72e35e82b1 100644 --- a/projects/rocjpeg/samples/jpegDecode/CMakeLists.txt +++ b/projects/rocjpeg/samples/jpegDecode/CMakeLists.txt @@ -32,14 +32,15 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path") endif() # Set AMD Clang as default compiler -if (NOT DEFINED CMAKE_CXX_COMPILER) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS ON) +if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() project(jpegdecode) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) diff --git a/projects/rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt b/projects/rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt index 690d580311..445ec94be9 100644 --- a/projects/rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt +++ b/projects/rocjpeg/samples/jpegDecodeBatched/CMakeLists.txt @@ -32,14 +32,15 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path") endif() # Set AMD Clang as default compiler -if (NOT DEFINED CMAKE_CXX_COMPILER) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS ON) +if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() project(jpegdecodebatched) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) diff --git a/projects/rocjpeg/samples/jpegDecodePerf/CMakeLists.txt b/projects/rocjpeg/samples/jpegDecodePerf/CMakeLists.txt index d8dcf12edf..0786710a2b 100644 --- a/projects/rocjpeg/samples/jpegDecodePerf/CMakeLists.txt +++ b/projects/rocjpeg/samples/jpegDecodePerf/CMakeLists.txt @@ -32,14 +32,15 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path") endif() # Set AMD Clang as default compiler -if (NOT DEFINED CMAKE_CXX_COMPILER) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS ON) +if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() project(jpegdecodeperf) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) diff --git a/projects/rocjpeg/test/CMakeLists.txt b/projects/rocjpeg/test/CMakeLists.txt index 8412369557..e025c76116 100644 --- a/projects/rocjpeg/test/CMakeLists.txt +++ b/projects/rocjpeg/test/CMakeLists.txt @@ -40,12 +40,13 @@ else() set(ROCM_PATH /opt/rocm CACHE PATH "${White}${PROJECT_NAME}: Default ROCm installation path${ColourReset}") endif() # Set AMD Clang as default compiler -if (NOT DEFINED CMAKE_CXX_COMPILER) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS ON) +if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED On) project(rocjpeg-test) diff --git a/projects/rocjpeg/test/rocjpeg_negative_api_tests/CMakeLists.txt b/projects/rocjpeg/test/rocjpeg_negative_api_tests/CMakeLists.txt index 34a095eb52..c2075139b1 100644 --- a/projects/rocjpeg/test/rocjpeg_negative_api_tests/CMakeLists.txt +++ b/projects/rocjpeg/test/rocjpeg_negative_api_tests/CMakeLists.txt @@ -34,7 +34,7 @@ endif() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED On) set(CMAKE_CXX_EXTENSIONS ON) -if (NOT DEFINED CMAKE_CXX_COMPILER) +if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_C_COMPILER ${ROCM_PATH}/bin/amdclang) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif()