Use C++17 to build everything when using clang (#812)

8fcb7409 · Paul Fultz II · GitHub · e8ae23b1 · 8fcb7409 · 8fcb7409
Unverified Commit 8fcb7409 authored Apr 27, 2021 by Paul Fultz II Committed by GitHub Apr 27, 2021
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +5 -1

src/targets/gpu/CMakeLists.txt src/targets/gpu/CMakeLists.txt +0 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,11 @@ endif()
 set(MIGRAPHX_ENABLE_CPU Off CACHE BOOL "")
 set(CMAKE_CXX_STANDARD_DEFAULT "")
-add_compile_options(-std=c++14)
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-std=c++17)
+else()
+    add_compile_options(-std=c++14)
+endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(EnableCompilerWarnings)

--- a/src/targets/gpu/CMakeLists.txt
+++ b/src/targets/gpu/CMakeLists.txt
@@ -286,7 +286,6 @@ endif()
 # Workaround broken rocblas headers
 target_compile_definitions(migraphx_gpu PUBLIC -D__HIP_PLATFORM_HCC__=1)
-target_compile_options(migraphx_gpu PRIVATE -std=c++17)
 target_link_libraries(migraphx_gpu PUBLIC migraphx MIOpen roc::rocblas)
 target_link_libraries(migraphx_gpu PRIVATE migraphx_device migraphx_kernels)