Skip to content

Commit

Permalink
Remove CMAKE_MODULE_PATH from critical variables list
Browse files Browse the repository at this point in the history
In ros/catkin#951, `CMAKE_MODULE_PATH` was removed from the CMake
coding standards documentation "Forbidden variables" list.

This patch mirrors that change in `catkin lint`.  The variable is
removed from `critical_vars` and the corresponding tests.

Fixes fkie#55.
  • Loading branch information
zultron committed Aug 3, 2018
1 parent 7076a36 commit 21790e8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/catkin_lint/checks/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ def special_vars(linter):
"CMAKE_INCLUDE_PATH",
"CMAKE_LIBRARY_PATH",
"CMAKE_FIND_ROOT_PATH",
"CMAKE_MODULE_PATH",
"CMAKE_PREFIX_PATH"
])

Expand Down
8 changes: 0 additions & 8 deletions test/test_checks_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ def test_special_vars(self):
self.assertEqual([ "CRITICAL_VAR_OVERWRITE" ], result)
result = mock_lint(env, pkg, "project(mock) set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} extra)", checks=cc.special_vars)
self.assertEqual([ "CRITICAL_VAR_APPEND" ], result)
result = mock_lint(env, pkg, "project(mock) list(GET CMAKE_MODULE_PATH 0)", checks=cc.special_vars)
self.assertEqual([], result)
result = mock_lint(env, pkg, "project(mock) list(LENGTH CMAKE_MODULE_PATH len)", checks=cc.special_vars)
self.assertEqual([], result)
result = mock_lint(env, pkg, "project(mock) list(APPEND CMAKE_MODULE_PATH extra)", checks=cc.special_vars)
self.assertEqual(["CRITICAL_VAR_APPEND"], result)
result = mock_lint(env, pkg, "project(mock) list(REVERSE CMAKE_MODULE_PATH)", checks=cc.special_vars)
self.assertEqual(["CRITICAL_VAR_OVERWRITE"], result)
result = mock_lint(env, pkg, "project(mock) list(INSERT PROJECT_NAME 0 wrong)", checks=cc.special_vars)
self.assertEqual(["IMMUTABLE_VAR"], result)

Expand Down

0 comments on commit 21790e8

Please sign in to comment.