diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-07 23:04:44 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-09-07 23:04:44 (GMT) |
| commit | 3a0d63242d959871b8f047e7f7ee1531f113f436 (patch) | |
| tree | f9dc8371fcaa42da483df8c5f5460fc9b03c5e76 | |
| parent | 91704ef2dee3ad606a6cc0f1e03e6f254d211b8f (diff) | |
| download | CMake-3a0d63242d959871b8f047e7f7ee1531f113f436.zip CMake-3a0d63242d959871b8f047e7f7ee1531f113f436.tar.gz CMake-3a0d63242d959871b8f047e7f7ee1531f113f436.tar.bz2 | |
KWStyle Test: Activate by default if KWStyle is found
Re-arrange the logic to look for KWStyle in the typical install
locations and under the Dashboards/Support directory for the
typical CMake dashboard machine. If it's there, turn on CMAKE_USE_KWSTYLE
by default, thereby activating the KWStyle related custom targets
and the KWStyle test.
| -rw-r--r-- | Utilities/KWStyle/CMakeLists.txt | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/Utilities/KWStyle/CMakeLists.txt b/Utilities/KWStyle/CMakeLists.txt index 4803ffa..5b0c84e 100644 --- a/Utilities/KWStyle/CMakeLists.txt +++ b/Utilities/KWStyle/CMakeLists.txt @@ -12,17 +12,34 @@ #----------------------------------------------------------------------------- # CMake uses KWStyle for checking the coding style -OPTION(CMAKE_USE_KWSTYLE "Run KWStyle in order to check for violations of the coding standard." OFF) -MARK_AS_ADVANCED(CMAKE_USE_KWSTYLE) -IF(CMAKE_USE_KWSTYLE) - FIND_PROGRAM(KWSTYLE_EXECUTABLE +# Search for a built-from-source KWStyle under Dashboards/Support on a typical +# dashboard machines: +# +SET(home "$ENV{HOME}") +IF(NOT home) + STRING(REPLACE "\\" "/" home "$ENV{USERPROFILE}") +ENDIF() + +FIND_PROGRAM(KWSTYLE_EXECUTABLE NAMES KWStyle PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware Inc.\\KWStyle 1.0.0]/bin" + "${home}/Dashboards/Support/KWStyle/bin" ) - MARK_AS_ADVANCED(KWSTYLE_EXECUTABLE) +MARK_AS_ADVANCED(KWSTYLE_EXECUTABLE) + +SET(CMAKE_USE_KWSTYLE_DEFAULT OFF) +IF(KWSTYLE_EXECUTABLE) + SET(CMAKE_USE_KWSTYLE_DEFAULT ON) +ENDIF() +OPTION(CMAKE_USE_KWSTYLE + "Add StyleCheck target and KWStyle test: run KWStyle to check for coding standard violations." + ${CMAKE_USE_KWSTYLE_DEFAULT}) +MARK_AS_ADVANCED(CMAKE_USE_KWSTYLE) + +IF(CMAKE_USE_KWSTYLE) OPTION(KWSTYLE_USE_VIM_FORMAT "Set KWStyle to generate errors with a VIM-compatible format." OFF) OPTION(KWSTYLE_USE_MSVC_FORMAT "Set KWStyle to generate errors with a VisualStudio-compatible format." OFF) MARK_AS_ADVANCED(KWSTYLE_USE_VIM_FORMAT) @@ -59,4 +76,3 @@ IF(CMAKE_USE_KWSTYLE) ADD_CUSTOM_TARGET(StyleCheck DEPENDS ${CMake_BINARY_DIR}/KWStyleReport.txt) ENDIF(CMAKE_USE_KWSTYLE) - |