diff --git a/CMakeLists.txt b/CMakeLists.txt index 3da74db4e..59768d8b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2501,12 +2501,14 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) add_compile_options(-Wno-psabi) endif() if(IS_ARM) - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.1.0") - set(CXX_ALIGN_FLAG -faligned-new) - if(NOT (CMAKE_VERSION VERSION_LESS "3.3")) - add_compile_options("$<$:${CXX_ALIGN_FLAG}>") - else() - add_compile_options("$<$,CXX>:${CXX_ALIGN_FLAG}>") + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.1.0") AND (CMAKE_VERSION VERSION_GREATER "3.1")) + if(CMAKE_CXX_STANDARD VERSION_LESS 17) + set(CXX_ALIGN_FLAG -faligned-new) + if(NOT (CMAKE_VERSION VERSION_LESS "3.3")) + add_compile_options("$<$:${CXX_ALIGN_FLAG}>") + else() + add_compile_options("$<$,CXX>:${CXX_ALIGN_FLAG}>") + endif() endif() endif() endif()