diff --git a/CMakeLists.txt b/CMakeLists.txt
index 736dd6f9b7..0708f5cb6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,26 @@
 #
 # * All cmake functions are lowercase.
 #
+# * For else, endif, endfunction, etc, never put the name of the statement
+#
+#	Instead of the very confusing:
+#		if (${var} STREQUAL "1") <-- condition now becomes if name
+#			# do somthing
+#		elseif (${var} STREQUAL "2") <-- another condition
+#			# do somthing
+#		else (${var} STREQUAL "1") <-- tags is referring to name of if
+#			# do somthing
+#		endif (${var} STREQUAL "1") <-- tag is referring to name of 
+#
+#	Do this:
+#		if (${var} STREQUAL "1") <-- condition now becomes if name
+#			# do somthing
+#		elseif (${var} STREQUAL "2") <-- another condition
+#			# do somthing
+#		else () <-- leave blank
+#			# do somthing
+#		endif () <-- leave blank
+#
 # Functions/Macros
 # ---------------------------------------------------------------------------
 #
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 73a73d21e8..be3d449710 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -510,7 +510,7 @@ function(px4_add_common_flags)
 		list(APPEND warnings
 			-Wno-unused-const-variable
 		)
-	else(${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
+	else()
 		list(APPEND warnings
 			-Werror=unused-but-set-variable
 			-Wformat=1