[onert] Use C++17 (#13475)

This commit enables C++17 for all onert modules. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <[email protected]>
Samsung · Jul 22, 2024 · 89a1b73 · 89a1b73
1 parent dbf5c80
commit 89a1b73
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/infra/nnfw/CMakeLists.txt b/infra/nnfw/CMakeLists.txt
@@ -56,13 +56,12 @@ macro(nnas_find_package PREFIX)
   )
 endmacro(nnas_find_package)
 
-# C++14 feature requires 5 or later
-# Using std::unordered_map shows build fail under 6.2
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2)
-  message(FATAL "Runtime build requires GNU Compiler version 6.2 or later.")
+# C++17 feature requires 9.1 or later for stable usage
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.1)
+  message(FATAL "Runtime build requires GNU Compiler version 9.1 or later.")
 endif()
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

diff --git a/runtime/contrib/style_transfer_app/CMakeLists.txt b/runtime/contrib/style_transfer_app/CMakeLists.txt
@@ -6,10 +6,6 @@ if(NOT BUILD_ONERT)
   return()
 endif(NOT BUILD_ONERT)
 
-# Use C++17 for style_transfer_app
-# TODO Remove this when we use C++17 for all runtime directories
-set(CMAKE_CXX_STANDARD 17)
-
 find_package(JPEG)
 if(JPEG_FOUND)
   add_definitions(-DNNFW_ST_APP_JPEG_SUPPORTED)

diff --git a/runtime/contrib/tflite_classify/CMakeLists.txt b/runtime/contrib/tflite_classify/CMakeLists.txt
@@ -2,10 +2,6 @@ if(NOT BUILD_TFLITE_CLASSIFY_APP)
   return()
 endif(NOT BUILD_TFLITE_CLASSIFY_APP)
 
-# Use C++17 for tflite_classify
-# TODO Remove this when we use C++17 for all runtime directories
-set(CMAKE_CXX_STANDARD 17)
-
 list(APPEND SOURCES "src/tflite_classify.cc")
 list(APPEND SOURCES "src/ImageClassifier.cc")
 list(APPEND SOURCES "src/InferenceInterface.cc")

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,4 @@ if(NOT ENABLE_TEST)
   return()
 endif(NOT ENABLE_TEST)
 
-# Use C++17 for tests
-# TODO: Remove this when we use C++17 for all runtime directories
-set(CMAKE_CXX_STANDARD 17)
-
 add_subdirectories()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,5 +1 @@
-# Use C++17 for tools
-# TODO: Remove this when we use C++17 for all runtime directories
-set(CMAKE_CXX_STANDARD 17)
-
 add_subdirectories()