diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake
index 4071b25..8b272bd 100644
--- a/CMLibCodeAnalysisClangTidy.cmake
+++ b/CMLibCodeAnalysisClangTidy.cmake
@@ -8,22 +8,23 @@ find_program(
     clang-tidy-6.0
     clang-tidy)
 if(CLANG_TIDY_EXE)
-  option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
-  if(CLANG_TIDY_FIX)
-    list(APPEND _args "-fix")
-  endif()
+  option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
 endif()
 
 function(add_clang_tidy_check target)
   set(_sources ${ARGN})
+  set(_args -extra-arg="-Wno-unknown-warning-option")
 
   if(CLANG_TIDY_EXE)
+    if(CMLIB_CLANG_TIDY_FIX)
+      list(APPEND _args "-fix")
+    endif()
     if(NOT TARGET clang-tidy-check)
       add_custom_target(clang-tidy-check)
     endif()
     add_custom_target(
       clang-tidy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ${CLANG_TIDY_EXE} -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR} ${_sources})
+      COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
     add_dependencies(clang-tidy-check-${target} ${target})
     add_dependencies(clang-tidy-check clang-tidy-check-${target})
   else()