Merge branch 'upstream-kwiml' into update-kwiml

Utilities/KWIML/test/CMakeLists.txt

@@ -20,7 +20,7 @@ set_property(DIRECTORY
 
 # Suppress printf/scanf format warnings; we test if the sizes match.
 foreach(lang C CXX)
-  if(KWIML_LANGUAGE_${lang} AND "${CMAKE_${lang}_COMPILER_ID}" STREQUAL GNU)
+  if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
   endif()
 endforeach()