From 0e860e73b08a8c384f7d14ab2f085d74a54d599f Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Thu, 26 Jun 2025 12:02:29 -0500 Subject: [PATCH] rocr/rocrtst: Update to c++17 [ROCm/ROCR-Runtime commit: f1bd89bd0def857b68036c20a18744070eb55be8] --- projects/rocr-runtime/CMakeLists.txt | 1 - projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt | 2 +- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 1 + .../runtime/hsa-runtime/cmake_modules/hsa_common.cmake | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index 8177c7e54b..ba8a551507 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -47,7 +47,6 @@ cmake_minimum_required(VERSION 3.7) project("rocr") set(CMAKE_VERBOSE_MAKEFILE ON) - ## Expose static library option if ( NOT DEFINED BUILD_SHARED_LIBS ) set ( BUILD_SHARED_LIBS ON ) diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt index 2e973927b6..6b2749455e 100755 --- a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt +++ b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt @@ -248,7 +248,7 @@ add_definitions(-DLITTLEENDIAN_CPU=1) # # Linux Compiler options # -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ") +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno") diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index 93b7b31752..d40b8936af 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -48,6 +48,7 @@ cmake_minimum_required ( VERSION 3.7 ) unset ( hsa-runtime64_LIB_DEPENDS CACHE ) set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_CXX_STANDARD 17) ## Set core runtime module name and project name. set ( CORE_RUNTIME_NAME "hsa-runtime64" ) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake index 04025b8ec6..ec5edcfb81 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake +++ b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake @@ -51,7 +51,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(ONLY64STR "64") endif() -set(HSA_COMMON_CXX_FLAGS "-Wall" "-std=c++11") +set(HSA_COMMON_CXX_FLAGS "-Wall") set(HSA_COMMON_CXX_FLAGS ${HSA_COMMON_CXX_FLAGS} "-fPIC") if (CMAKE_COMPILER_IS_GNUCXX) set(HSA_COMMON_CXX_FLAGS ${HSA_COMMON_CXX_FLAGS} "-Wl,--unresolved-symbols=ignore-in-shared-libs")