Fixed warn: mangled name for .. will change in C++17 because the exce…

…ption specification is part of a function type
mapsme · Jun 25, 2018 · 8497b01 · 8497b01
1 parent bb257b4
commit 8497b01
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -261,6 +261,8 @@ add_compile_options(
 )
 
 add_clang_compile_options("-Wshorten-64-to-32")
+add_clang_cpp_compile_options("-Wno-noexcept-type")
+add_gcc_cpp_compile_options("-Wno-noexcept-type")
 
 add_subdirectory(base)
 add_subdirectory(coding)

diff --git a/cmake/OmimHelpers.cmake b/cmake/OmimHelpers.cmake
@@ -168,6 +168,18 @@ function(add_gcc_compile_options)
   endif()
 endfunction()
 
+function(add_clang_cpp_compile_options)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${ARGV}>")
+  endif()
+endfunction()
+
+function(add_gcc_cpp_compile_options)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${ARGV}>")
+  endif()
+endfunction()
+
 function(export_directory_flags filename)
   get_directory_property(include_directories INCLUDE_DIRECTORIES)
   get_directory_property(definitions COMPILE_DEFINITIONS)