diff --git a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
index 889c9b6994..d997599aed 100644
--- a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
+++ b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
@@ -60,7 +60,12 @@ macro(CompilerChecksAndSetups)
             set(CMAKE_CXX_STANDARD 11)
         endif()
 
-        set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-write-strings ${CMAKE_CXX_FLAGS}")
+        # For now only set pedantic option for clang
+        if(CMAKE_COMPILER_IS_CLANGXX)
+            set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wno-write-strings ${CMAKE_CXX_FLAGS}")
+        else()
+            set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-write-strings ${CMAKE_CXX_FLAGS}")
+        endif()
         include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
         # get linker errors as soon as possible and not at runtime e.g. for modules
diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
index 96bf4548cc..02e011c05c 100644
--- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -8,6 +8,9 @@ macro(PrintFinalReport)
         message(STATUS "Build type:          ${CMAKE_BUILD_TYPE}")
     endif()
 
+    message(STATUS "Compiler:            ${CMAKE_CXX_COMPILER}")
+    message(STATUS "Flags:               ${CMAKE_CXX_FLAGS}")
+
     # Qt5 needs/sets PYTHON_CONFIG_SUFFIX regarding Shiboken
     message(STATUS "Python:              [${PYTHON_EXECUTABLE}] [${PYTHON_CONFIG_SUFFIX}]")