diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e23439b..77592a2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,22 +94,24 @@ list(APPEND REDREAM_INCLUDE_DIRS deps/xbyak-4.85) #-------------------------------------------------- # format #-------------------------------------------------- -find_package(ClangFormat REQUIRED) +find_package(ClangFormat) +if(CLANG_FORMAT_FOUND) file(GLOB_RECURSE CLANG_FORMAT_ARGS "src/*.cc" "src/*.h" "test/*.cc" "test/*.h") add_custom_target(format ${CLANG_FORMAT_EXECUTABLE} -style=Google -i ${CLANG_FORMAT_ARGS}) - +endif() #-------------------------------------------------- # tidy #-------------------------------------------------- find_package(ClangTidy REQUIRED) +if(CLANG_TIDY_FOUND) file(GLOB_RECURSE CLANG_TIDY_ARGS "src/*.cc" "test/*.cc") add_custom_target(tidy ${CLANG_TIDY_EXECUTABLE} -p=${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json -checks=-*,readability-* ${CLANG_TIDY_ARGS}) - +endif() #-------------------------------------------------- # emulator @@ -191,7 +193,7 @@ endif() source_group_by_dir(REDREAM_SOURCES) if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") - set(REDREAM_COMPILE_FLAGS -std=c++11 -fno-operator-names -fno-rtti -Wall -Wextra -Werror -Wno-unused-parameter) + set(REDREAM_COMPILE_FLAGS -std=c++11 -fno-operator-names -Wall -Wextra -Werror -Wno-unused-parameter) string(TOLOWER ${CMAKE_BUILD_TYPE} BUILD_TYPE) diff --git a/cmake/FindClangFormat.cmake b/cmake/FindClangFormat.cmake index 62cf30af..f97b4c01 100644 --- a/cmake/FindClangFormat.cmake +++ b/cmake/FindClangFormat.cmake @@ -1,5 +1,5 @@ find_program(CLANG_FORMAT_EXECUTABLE NAMES clang-format clang-format-3.6 clang-format-3.7) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(cppcheck +find_package_handle_standard_args(clang_format DEFAULT_MSG CLANG_FORMAT_EXECUTABLE) diff --git a/cmake/FindClangTidy.cmake b/cmake/FindClangTidy.cmake index 461f2b18..8b546e3d 100644 --- a/cmake/FindClangTidy.cmake +++ b/cmake/FindClangTidy.cmake @@ -1,5 +1,5 @@ find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy clang-tidy-3.6 clang-tidy-3.7) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(cppcheck +find_package_handle_standard_args(clang_tidy DEFAULT_MSG CLANG_TIDY_EXECUTABLE)