Unverified Commit af2edf9d authored by Nikita Titov's avatar Nikita Titov Committed by GitHub
Browse files

[ci][cmake] make cmake-lint more strict (#7060)

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev

* dev
parent 50f11a9f
...@@ -21,7 +21,7 @@ repos: ...@@ -21,7 +21,7 @@ repos:
rev: '1.4.3' rev: '1.4.3'
hooks: hooks:
- id: cmakelint - id: cmakelint
args: ["--linelength=120", "--filter=-convention/filename,-package/stdargs,-readability/wonkycase"] args: ["--linelength=120"]
- repo: https://github.com/cpplint/cpplint - repo: https://github.com/cpplint/cpplint
rev: '2.0.2' rev: '2.0.2'
hooks: hooks:
......
...@@ -647,12 +647,16 @@ if(BUILD_CPP_TEST) ...@@ -647,12 +647,16 @@ if(BUILD_CPP_TEST)
if(NOT GTEST_FOUND) if(NOT GTEST_FOUND)
message(STATUS "Did not find Google Test in the system root. Fetching Google Test now...") message(STATUS "Did not find Google Test in the system root. Fetching Google Test now...")
include(FetchContent) include(FetchContent)
# lint_cmake: -readability/wonkycase
FetchContent_Declare( FetchContent_Declare(
# lint_cmake: +readability/wonkycase
googletest googletest
GIT_REPOSITORY https://github.com/google/googletest.git GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.14.0 GIT_TAG v1.14.0
) )
# lint_cmake: -readability/wonkycase
FetchContent_MakeAvailable(googletest) FetchContent_MakeAvailable(googletest)
# lint_cmake: +readability/wonkycase
add_library(GTest::GTest ALIAS gtest) add_library(GTest::GTest ALIAS gtest)
endif() endif()
......
...@@ -13,16 +13,22 @@ set(BOOST_TAG "boost-${BOOST_VERSION_DOT}.0") ...@@ -13,16 +13,22 @@ set(BOOST_TAG "boost-${BOOST_VERSION_DOT}.0")
# Build Independent OpenCL library # Build Independent OpenCL library
include(FetchContent) include(FetchContent)
# lint_cmake: -readability/wonkycase
FetchContent_Declare(OpenCL-Headers GIT_REPOSITORY ${OPENCL_HEADER_REPOSITORY} GIT_TAG ${OPENCL_HEADER_TAG}) FetchContent_Declare(OpenCL-Headers GIT_REPOSITORY ${OPENCL_HEADER_REPOSITORY} GIT_TAG ${OPENCL_HEADER_TAG})
FetchContent_GetProperties(OpenCL-Headers) FetchContent_GetProperties(OpenCL-Headers)
# lint_cmake: +readability/wonkycase
if(NOT OpenCL-Headers_POPULATED) if(NOT OpenCL-Headers_POPULATED)
# lint_cmake: -readability/wonkycase
FetchContent_MakeAvailable(OpenCL-Headers) FetchContent_MakeAvailable(OpenCL-Headers)
# lint_cmake: +readability/wonkycase
message(STATUS "Populated OpenCL Headers") message(STATUS "Populated OpenCL Headers")
endif() endif()
set(OPENCL_ICD_LOADER_HEADERS_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for OpenCL ICD Loader set(OPENCL_ICD_LOADER_HEADERS_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for OpenCL ICD Loader
set(OpenCL_INCLUDE_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for Boost::Compute set(OpenCL_INCLUDE_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for Boost::Compute
# lint_cmake: -readability/wonkycase
FetchContent_Declare( FetchContent_Declare(
# lint_cmake: +readability/wonkycase
OpenCL-ICD-Loader OpenCL-ICD-Loader
GIT_REPOSITORY GIT_REPOSITORY
${OPENCL_LOADER_REPOSITORY} ${OPENCL_LOADER_REPOSITORY}
...@@ -30,9 +36,13 @@ FetchContent_Declare( ...@@ -30,9 +36,13 @@ FetchContent_Declare(
${OPENCL_LOADER_TAG} ${OPENCL_LOADER_TAG}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
# lint_cmake: -readability/wonkycase
FetchContent_GetProperties(OpenCL-ICD-Loader) FetchContent_GetProperties(OpenCL-ICD-Loader)
# lint_cmake: +readability/wonkycase
if(NOT OpenCL-ICD-Loader_POPULATED) if(NOT OpenCL-ICD-Loader_POPULATED)
# lint_cmake: -readability/wonkycase
FetchContent_MakeAvailable(OpenCL-ICD-Loader) FetchContent_MakeAvailable(OpenCL-ICD-Loader)
# lint_cmake: +readability/wonkycase
if(WIN32) if(WIN32)
set(USE_DYNAMIC_VCXX_RUNTIME ON) set(USE_DYNAMIC_VCXX_RUNTIME ON)
endif() endif()
...@@ -60,7 +70,9 @@ endif() ...@@ -60,7 +70,9 @@ endif()
# Build Independent Boost libraries # Build Independent Boost libraries
include(ExternalProject) include(ExternalProject)
include(ProcessorCount) include(ProcessorCount)
# lint_cmake: -readability/wonkycase
ProcessorCount(J) ProcessorCount(J)
# lint_cmake: +readability/wonkycase
set(BOOST_BASE "${PROJECT_BINARY_DIR}/Boost") set(BOOST_BASE "${PROJECT_BINARY_DIR}/Boost")
set(BOOST_INCLUDE "${BOOST_BASE}/source" CACHE PATH "") set(BOOST_INCLUDE "${BOOST_BASE}/source" CACHE PATH "")
set(BOOST_LIBRARY "${BOOST_BASE}/source/stage/lib" CACHE PATH "") set(BOOST_LIBRARY "${BOOST_BASE}/source/stage/lib" CACHE PATH "")
...@@ -160,7 +172,9 @@ list( ...@@ -160,7 +172,9 @@ list(
"tools/boost_install" "tools/boost_install"
"tools/build" "tools/build"
) )
# lint_cmake: -readability/wonkycase
ExternalProject_Add( ExternalProject_Add(
# lint_cmake: +readability/wonkycase
Boost Boost
TMP_DIR "${BOOST_BASE}/tmp" TMP_DIR "${BOOST_BASE}/tmp"
STAMP_DIR "${BOOST_BASE}/stamp" STAMP_DIR "${BOOST_BASE}/stamp"
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
# LIBR_CORE_LIBRARY # LIBR_CORE_LIBRARY
# and a CMake function to create R.lib for MSVC # and a CMake function to create R.lib for MSVC
# lint_cmake: -convention/filename
if(NOT R_ARCH) if(NOT R_ARCH)
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
set(R_ARCH "i386") set(R_ARCH "i386")
...@@ -240,7 +242,9 @@ endif() ...@@ -240,7 +242,9 @@ endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
if(WIN32 AND MSVC) if(WIN32 AND MSVC)
# lint_cmake: -package/stdargs
find_package_handle_standard_args( find_package_handle_standard_args(
# lint_cmake: +package/stdargs
LibR DEFAULT_MSG LibR DEFAULT_MSG
LIBR_HOME LIBR_HOME
LIBR_EXECUTABLE LIBR_EXECUTABLE
...@@ -250,7 +254,9 @@ if(WIN32 AND MSVC) ...@@ -250,7 +254,9 @@ if(WIN32 AND MSVC)
LIBR_MSVC_CORE_LIBRARY LIBR_MSVC_CORE_LIBRARY
) )
else() else()
# lint_cmake: -package/stdargs
find_package_handle_standard_args( find_package_handle_standard_args(
# lint_cmake: +package/stdargs
LibR DEFAULT_MSG LibR DEFAULT_MSG
LIBR_HOME LIBR_HOME
LIBR_EXECUTABLE LIBR_EXECUTABLE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment