dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2849 from jgoppert/cmake-coding-standard-fix 

Fixed confusing else clause, added to coding standard.
This commit is contained in:
Lorenz Meier 2015-09-12 22:58:10 +02:00
parent d7e69baf80 3343d96a08
commit 2ab9f0baa8
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -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") <-- tag is referring to name of if
# # do somthing
# endif (${var} STREQUAL "1") <-- tag is referring to name of if
#
# 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
# ---------------------------------------------------------------------------
#

2
cmake/common/px4_base.cmake
View File

@ -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