From 2bc1f560dd6179d159ca67c69a32aea34ed8c275 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 14 Jun 2018 16:08:49 +0200 Subject: [PATCH] cmake: CHECK_INCLUDES -> CHECK_IWYU --- CMakeLists.txt | 4 ---- cmake/ctest/build.ctest | 4 ++-- cmake/ctest/configure_darwin.ctest | 6 +++--- cmake/ctest/configure_linux.ctest | 6 +++--- cmake/ctest/configure_windows.ctest | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be2cbc7e..ee3345e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,10 +51,6 @@ else() rwdep_wrap_find_packages() endif() -if(CHECK_INCLUDES) - find_package(IncludeWhatYouUse REQUIRED) -endif() - set(OpenGL_GL_PREFERENCE GLVND) find_package(OpenGL REQUIRED) diff --git a/cmake/ctest/build.ctest b/cmake/ctest/build.ctest index 41de75fe..f1847c17 100644 --- a/cmake/ctest/build.ctest +++ b/cmake/ctest/build.ctest @@ -7,7 +7,7 @@ set(_ARGS_BOOL USE_CONAN DEBUG - CHECK_INCLUDES + CHECK_IWYU BUILD_TOOLS BUILD_VIEWER @@ -165,7 +165,7 @@ set(_CONFIGURE_OPTIONS "-DTESTS_NODATA=${TESTS_NODATA}" "-DTEST_COVERAGE=${RUN_COVERAGE}" "-DSEPARATE_TEST_SUITES=${SEPARATE_TEST_SUITES}" - "-DCHECK_INCLUDES=${CHECK_INCLUDES}" + "-DCHECK_IWYU=${CHECK_IWYU}" "-DCMAKE_BUILD_TYPE=${_CMAKE_BUILD_TYPE}" "-DENABLE_SANITIZERS=${ENABLE_SANITIZERS}" "-DUSE_CONAN=${USE_CONAN}" diff --git a/cmake/ctest/configure_darwin.ctest b/cmake/ctest/configure_darwin.ctest index 068056a0..06f85549 100644 --- a/cmake/ctest/configure_darwin.ctest +++ b/cmake/ctest/configure_darwin.ctest @@ -8,13 +8,13 @@ set(CONFIGURE_EXTRA_OPTIONS ";") set(BUILD_TOOLS TRUE) set(BUILD_VIEWER TRUE) set(COVERAGE_COMMAND gcov) -set(CHECK_INCLUDES FALSE) +set(CHECK_IWYU FALSE) set(ENABLE_SANITIZERS "") if(MODEL_NAME STREQUAL "EXPERIMENTAL") - set(CHECK_INCLUDES FALSE) + set(CHECK_IWYU FALSE) else() - set(CHECK_INCLUDES FALSE) + set(CHECK_IWYU FALSE) endif() set(CONAN_ARCH "x86_64") diff --git a/cmake/ctest/configure_linux.ctest b/cmake/ctest/configure_linux.ctest index a323147e..5f36959a 100644 --- a/cmake/ctest/configure_linux.ctest +++ b/cmake/ctest/configure_linux.ctest @@ -8,13 +8,13 @@ set(CONFIGURE_EXTRA_OPTIONS ";") set(BUILD_TOOLS TRUE) set(BUILD_VIEWER TRUE) set(COVERAGE_COMMAND gcov) -set(CHECK_INCLUDES FALSE) +set(CHECK_IWYU FALSE) set(ENABLE_SANITIZERS "address") if(MODEL_NAME STREQUAL "EXPERIMENTAL") - set(CHECK_INCLUDES FALSE) + set(CHECK_IWYU FALSE) else() - set(CHECK_INCLUDES FALSE) + set(CHECK_IWYU FALSE) endif() set(CONAN_ARCH "x86_64") diff --git a/cmake/ctest/configure_windows.ctest b/cmake/ctest/configure_windows.ctest index bd5d709a..ff5c8ffa 100644 --- a/cmake/ctest/configure_windows.ctest +++ b/cmake/ctest/configure_windows.ctest @@ -37,5 +37,5 @@ set(CONAN_ARCH "x86_64") set(BUILD_TOOLS TRUE) set(BUILD_VIEWER TRUE) set(COVERAGE_COMMAND "echo") #FIXME: ENABLE -set(CHECK_INCLUDES FALSE) #FIXME: ENABLE +set(CHECK_IWYU FALSE) #FIXME: ENABLE set(ENABLE_SANITIZERS "")