From ed6de125c92ba1db4ccafc4e9c8a1a1d905a0347 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 1 Aug 2020 23:47:47 -0400 Subject: [PATCH] format: include .in files --- .pre-commit-config.yaml | 4 +++- tools/FindPythonLibsNew.cmake | 3 ++- tools/cmake_uninstall.cmake.in | 6 +++--- tools/pybind11Config.cmake.in | 35 ++++++++++++++++++++++++++-------- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7fb3a13b7..a046c6fcf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,10 +27,12 @@ repos: exclude: ^(docs/.*|tools/.*)$ - repo: https://github.com/cheshirekow/cmake-format-precommit - rev: v0.6.10 + rev: v0.6.11 hooks: - id: cmake-format additional_dependencies: [pyyaml] + types: [file] + files: (\.cmake|CMakeLists.txt)(.in)?$ - repo: local hooks: diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake index cc56351a9..822ec7718 100644 --- a/tools/FindPythonLibsNew.cmake +++ b/tools/FindPythonLibsNew.cmake @@ -191,7 +191,8 @@ else() find_library( PYTHON_LIBRARY NAMES "python${PYTHON_LIBRARY_SUFFIX}" - PATHS ${_PYTHON_LIBS_SEARCH} NO_DEFAULT_PATH) + PATHS ${_PYTHON_LIBS_SEARCH} + NO_DEFAULT_PATH) # If all else fails, just set the name/version and let the linker figure out the path. if(NOT PYTHON_LIBRARY) diff --git a/tools/cmake_uninstall.cmake.in b/tools/cmake_uninstall.cmake.in index 53b16fb95..1e5d2bb87 100644 --- a/tools/cmake_uninstall.cmake.in +++ b/tools/cmake_uninstall.cmake.in @@ -10,10 +10,10 @@ foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") exec_program( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + "@CMAKE_COMMAND@" ARGS + "-E remove \"$ENV{DESTDIR}${file}\"" OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) + RETURN_VALUE rm_retval) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") endif() diff --git a/tools/pybind11Config.cmake.in b/tools/pybind11Config.cmake.in index a8b3cb1f1..c86e0dea2 100644 --- a/tools/pybind11Config.cmake.in +++ b/tools/pybind11Config.cmake.in @@ -72,7 +72,6 @@ set(pybind11_VERSION_TYPE "@pybind11_VERSION_TYPE@") check_required_components(pybind11) - include("${CMAKE_CURRENT_LIST_DIR}/pybind11Tools.cmake") #----------------------------------------------------------------------------- @@ -86,15 +85,35 @@ if(NOT TARGET pybind11::pybind11) find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED) list(REMOVE_AT CMAKE_MODULE_PATH -1) - set_property(TARGET pybind11::pybind11 APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PYTHON_INCLUDE_DIRS}) - set_property(TARGET pybind11::pybind11 APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${PYTHON_INCLUDE_DIRS}) + set_property( + TARGET pybind11::pybind11 + APPEND + PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PYTHON_INCLUDE_DIRS}) + set_property( + TARGET pybind11::pybind11 + APPEND + PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${PYTHON_INCLUDE_DIRS}) - set_property(TARGET pybind11::embed APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${PYTHON_LIBRARIES}) - set_property(TARGET pybind11::module APPEND PROPERTY INTERFACE_LINK_LIBRARIES - "$<$,$>:$>") + set_property( + TARGET pybind11::embed + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES ${PYTHON_LIBRARIES}) + set_property( + TARGET pybind11::module + APPEND + PROPERTY + INTERFACE_LINK_LIBRARIES + "$<$,$>:$>" + ) - get_property(_iid TARGET pybind11::pybind11 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) - get_property(_ill TARGET pybind11::module PROPERTY INTERFACE_LINK_LIBRARIES) + get_property( + _iid + TARGET pybind11::pybind11 + PROPERTY INTERFACE_INCLUDE_DIRECTORIES) + get_property( + _ill + TARGET pybind11::module + PROPERTY INTERFACE_LINK_LIBRARIES) set(pybind11_INCLUDE_DIRS ${_iid}) set(pybind11_LIBRARIES ${_ico} ${_ill})