Skip to content

Commit f11e5bc

Browse files
committed
format: apply cmake-format
1 parent 1987d89 commit f11e5bc

File tree

15 files changed

+484
-414
lines changed

15 files changed

+484
-414
lines changed

.cmake-format.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,7 @@ format:
6767
# If true, the parsers may infer whether or not an argument
6868
# list is sortable (without annotation).
6969
autosort: false
70+
71+
# Causes a few issues - can be solved later, possibly.
72+
markup:
73+
enable_markup: false

CMakeLists.txt

Lines changed: 118 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,30 @@ cmake_minimum_required(VERSION 3.7)
1010
# VERSION 3.7...3.18, but some versions of MCVS have a patched CMake 3.11
1111
# that do not work properly with this syntax, so using the following workaround:
1212
if(${CMAKE_VERSION} VERSION_LESS 3.18)
13-
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
13+
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
1414
else()
15-
cmake_policy(VERSION 3.18)
15+
cmake_policy(VERSION 3.18)
1616
endif()
1717

1818
# Extract project version from source
19-
file(
20-
STRINGS
21-
"${CMAKE_CURRENT_SOURCE_DIR}/include/pybind11/detail/common.h"
22-
pybind11_version_defines
23-
REGEX
24-
"#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) ")
19+
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/pybind11/detail/common.h"
20+
pybind11_version_defines REGEX "#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) ")
2521

2622
foreach(ver ${pybind11_version_defines})
27-
if (ver MATCHES [[#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$]])
28-
set(PYBIND11_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}")
29-
endif()
23+
if(ver MATCHES [[#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$]])
24+
set(PYBIND11_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}")
25+
endif()
3026
endforeach()
3127

3228
if(PYBIND11_VERSION_PATCH MATCHES [[([a-zA-Z]+)]])
33-
set(PYBIND11_VERSION_TYPE "${CMAKE_MATCH_1}")
29+
set(PYBIND11_VERSION_TYPE "${CMAKE_MATCH_1}")
3430
endif()
3531
string(REGEX MATCH "[0-9]+" PYBIND11_VERSION_PATCH "${PYBIND11_VERSION_PATCH}")
3632

3733
project(
38-
pybind11
39-
LANGUAGES
40-
CXX
41-
VERSION
42-
"${PYBIND11_VERSION_MAJOR}.${PYBIND11_VERSION_MINOR}.${PYBIND11_VERSION_PATCH}"
43-
)
34+
pybind11
35+
LANGUAGES CXX
36+
VERSION "${PYBIND11_VERSION_MAJOR}.${PYBIND11_VERSION_MINOR}.${PYBIND11_VERSION_PATCH}")
4437

4538
# Standard includes
4639
include(GNUInstallDirs)
@@ -51,26 +44,25 @@ message(STATUS "pybind11 v${pybind11_VERSION} ${PYBIND11_VERSION_TYPE}")
5144

5245
# Check if pybind11 is being used directly or via add_subdirectory
5346
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
54-
set(PYBIND11_MASTER_PROJECT ON)
55-
message(STATUS "CMake ${CMAKE_VERSION}")
47+
set(PYBIND11_MASTER_PROJECT ON)
48+
message(STATUS "CMake ${CMAKE_VERSION}")
5649

57-
if(CMAKE_CXX_STANDARD)
58-
set(CMAKE_CXX_EXTENSIONS OFF)
59-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
60-
endif()
50+
if(CMAKE_CXX_STANDARD)
51+
set(CMAKE_CXX_EXTENSIONS OFF)
52+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
53+
endif()
6154
else()
62-
set(PYBIND11_MASTER_PROJECT OFF)
63-
set(pybind11_system SYSTEM)
55+
set(PYBIND11_MASTER_PROJECT OFF)
56+
set(pybind11_system SYSTEM)
6457
endif()
6558

6659
option(PYBIND11_INSTALL "Install pybind11 header files?" ${PYBIND11_MASTER_PROJECT})
6760
option(PYBIND11_TEST "Build pybind11 test suite?" ${PYBIND11_MASTER_PROJECT})
6861
option(PYBIND11_CLASSIC_LTO "Use the classic LTO flag algorithm, even on CMake 3.9+" OFF)
6962
cmake_dependent_option(
70-
USE_PYTHON_INCLUDE_DIR
71-
"Install pybind11 headers in Python include directory instead of default installation prefix" OFF
72-
"PYBIND11_INSTALL" OFF
73-
)
63+
USE_PYTHON_INCLUDE_DIR
64+
"Install pybind11 headers in Python include directory instead of default installation prefix"
65+
OFF "PYBIND11_INSTALL" OFF)
7466

7567
# NB: when adding a header don't forget to also add it to setup.py
7668
set(PYBIND11_HEADERS
@@ -96,40 +88,52 @@ set(PYBIND11_HEADERS
9688
include/pybind11/pybind11.h
9789
include/pybind11/pytypes.h
9890
include/pybind11/stl.h
99-
include/pybind11/stl_bind.h
100-
)
91+
include/pybind11/stl_bind.h)
10192

10293
# TODO: compare with grep and warn if missmatched
10394

10495
# cmake 3.12 added list(TRANSFORM <list> PREPEND
10596
# But we can't use it yet
106-
string(REPLACE "include/" "${CMAKE_CURRENT_SOURCE_DIR}/include/"
107-
PYBIND11_HEADERS "${PYBIND11_HEADERS}")
108-
97+
string(REPLACE "include/" "${CMAKE_CURRENT_SOURCE_DIR}/include/" PYBIND11_HEADERS
98+
"${PYBIND11_HEADERS}")
10999

110100
# Classic mode
111101

112102
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools")
113103
include(pybind11Tools)
114104

115105
# Cache variables so pybind11_add_module can be used in parent projects
116-
set(PYBIND11_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/include" CACHE INTERNAL "")
117-
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} CACHE INTERNAL "")
118-
set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} CACHE INTERNAL "")
119-
set(PYTHON_MODULE_PREFIX ${PYTHON_MODULE_PREFIX} CACHE INTERNAL "")
120-
set(PYTHON_MODULE_EXTENSION ${PYTHON_MODULE_EXTENSION} CACHE INTERNAL "")
121-
set(PYTHON_VERSION_MAJOR ${PYTHON_VERSION_MAJOR} CACHE INTERNAL "")
122-
set(PYTHON_VERSION_MINOR ${PYTHON_VERSION_MINOR} CACHE INTERNAL "")
123-
set(PYTHON_IS_DEBUG "${PYTHON_IS_DEBUG}" CACHE INTERNAL "")
124-
106+
set(PYBIND11_INCLUDE_DIR
107+
"${CMAKE_CURRENT_LIST_DIR}/include"
108+
CACHE INTERNAL "")
109+
set(PYTHON_INCLUDE_DIRS
110+
${PYTHON_INCLUDE_DIRS}
111+
CACHE INTERNAL "")
112+
set(PYTHON_LIBRARIES
113+
${PYTHON_LIBRARIES}
114+
CACHE INTERNAL "")
115+
set(PYTHON_MODULE_PREFIX
116+
${PYTHON_MODULE_PREFIX}
117+
CACHE INTERNAL "")
118+
set(PYTHON_MODULE_EXTENSION
119+
${PYTHON_MODULE_EXTENSION}
120+
CACHE INTERNAL "")
121+
set(PYTHON_VERSION_MAJOR
122+
${PYTHON_VERSION_MAJOR}
123+
CACHE INTERNAL "")
124+
set(PYTHON_VERSION_MINOR
125+
${PYTHON_VERSION_MINOR}
126+
CACHE INTERNAL "")
127+
set(PYTHON_IS_DEBUG
128+
"${PYTHON_IS_DEBUG}"
129+
CACHE INTERNAL "")
125130

126131
if(PYBIND11_TEST OR (BUILD_TESTING AND PYBIND11_MASTER_PROJECT))
127-
add_subdirectory(tests)
132+
add_subdirectory(tests)
128133
endif()
129134

130-
131135
if(USE_PYTHON_INCLUDE_DIR)
132-
file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${PYTHON_INCLUDE_DIRS})
136+
file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${PYTHON_INCLUDE_DIRS})
133137
endif()
134138

135139
# Note: when creating targets, you cannot use if statements at configure time -
@@ -138,26 +142,22 @@ endif()
138142

139143
# Build an interface library target:
140144
add_library(pybind11 INTERFACE)
141-
add_library(pybind11::pybind11 ALIAS pybind11) # to match exported target
145+
add_library(pybind11::pybind11 ALIAS pybind11) # to match exported target
142146

143-
target_include_directories(pybind11 ${pybind11_system} INTERFACE $<BUILD_INTERFACE:${PYBIND11_INCLUDE_DIR}>
144-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
147+
target_include_directories(
148+
pybind11 ${pybind11_system} INTERFACE $<BUILD_INTERFACE:${PYBIND11_INCLUDE_DIR}>
149+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
145150
# Only add Python for build - must be added during the import for config since it has to be re-discovered.
146151
target_include_directories(pybind11 SYSTEM INTERFACE $<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>)
147152

148153
if(CMAKE_VERSION VERSION_LESS 3.13)
149-
target_compile_features(
150-
pybind11
151-
INTERFACE
152-
cxx_inheriting_constructors
153-
cxx_user_literals
154-
cxx_right_angle_brackets
155-
)
154+
target_compile_features(pybind11 INTERFACE cxx_inheriting_constructors cxx_user_literals
155+
cxx_right_angle_brackets)
156156
else()
157-
# This was added in CMake 3.8, but we are keeping a consistent breaking
158-
# point for the config file at 3.13. A config generated by CMake 3.13+
159-
# can only be read in 3.13+ due to the SHELL usage later, so this is safe to do.
160-
target_compile_features(pybind11 INTERFACE cxx_std_11)
157+
# This was added in CMake 3.8, but we are keeping a consistent breaking
158+
# point for the config file at 3.13. A config generated by CMake 3.13+
159+
# can only be read in 3.13+ due to the SHELL usage later, so this is safe to do.
160+
target_compile_features(pybind11 INTERFACE cxx_std_11)
161161
endif()
162162

163163
add_library(module INTERFACE)
@@ -167,23 +167,26 @@ target_link_libraries(module INTERFACE pybind11::pybind11)
167167

168168
# See https://github.com/Kitware/CMake/blob/master/Modules/CMakePlatformId.h.in for platform IDs
169169
# Note: CMake 3.15 allows $<PLATFORM_ID:Windows,Cygwin>
170-
target_link_libraries(module INTERFACE "$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>")
170+
target_link_libraries(
171+
module
172+
INTERFACE
173+
"$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>")
171174

172175
if(CMAKE_VERSION VERSION_LESS 3.13)
173-
target_link_libraries(module INTERFACE "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>")
176+
target_link_libraries(module INTERFACE "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>")
174177
else()
175-
# SHELL (3.12+) forces this to remain together, and link_options was added in 3.13+
176-
# This is safer, because you are ensured the deduplication pass in CMake will not consider
177-
# these separate and remove one but not the other.
178-
target_link_options(module INTERFACE "$<$<PLATFORM_ID:Darwin>:SHELL:-undefined dynamic_lookup>")
178+
# SHELL (3.12+) forces this to remain together, and link_options was added in 3.13+
179+
# This is safer, because you are ensured the deduplication pass in CMake will not consider
180+
# these separate and remove one but not the other.
181+
target_link_options(module INTERFACE "$<$<PLATFORM_ID:Darwin>:SHELL:-undefined dynamic_lookup>")
179182
endif()
180183

181-
182184
# Workaround for Python 2.7 and C++17 (C++14 as a warning) incompatibility
183185
# This adds the flags -Wno-register and -Wno-deprecated-register if the compiler
184186
# is Clang 3.9+ or AppleClang and the compile language is CXX, or /wd5033 for MSVC (all languages,
185187
# since MSVC didn't recognize COMPILE_LANGUAGE until CMake 3.11+).
186-
set(clang_4plus "$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,3.9>>>")
188+
set(clang_4plus
189+
"$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,3.9>>>")
187190
set(no_register "$<OR:${clang_4plus},$<CXX_COMPILER_ID:AppleClang>>")
188191
set(cxx_no_register "$<AND:$<COMPILE_LANGUAGE:CXX>,${no_register}>")
189192
set(msvc "$<CXX_COMPILER_ID:MSVC>")
@@ -196,58 +199,50 @@ add_library(pybind11::embed ALIAS embed)
196199
target_link_libraries(embed INTERFACE pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
197200

198201
if(PYBIND11_INSTALL)
199-
install(DIRECTORY ${PYBIND11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
200-
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
201-
set(PYBIND11_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for pybind11Config.cmake")
202-
203-
configure_package_config_file(tools/${PROJECT_NAME}Config.cmake.in
204-
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
205-
INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
206-
207-
if(CMAKE_VERSION VERSION_LESS 3.14)
208-
# Remove CMAKE_SIZEOF_VOID_P from ConfigVersion.cmake since the library does
209-
# not depend on architecture specific settings or libraries.
210-
set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
211-
unset(CMAKE_SIZEOF_VOID_P)
212-
213-
write_basic_package_version_file(
214-
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
215-
VERSION
216-
${PROJECT_VERSION}
217-
COMPATIBILITY
218-
AnyNewerVersion
219-
)
220-
221-
set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
222-
else()
223-
# CMake 3.14+ natively supports header-only libraries
224-
write_basic_package_version_file(
225-
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
226-
VERSION
227-
${PROJECT_VERSION}
228-
COMPATIBILITY
229-
AnyNewerVersion
230-
ARCH_INDEPENDENT
231-
)
232-
endif()
233-
234-
install(
235-
FILES
236-
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
237-
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
238-
tools/FindPythonLibsNew.cmake
239-
tools/pybind11Tools.cmake
240-
DESTINATION
241-
${PYBIND11_CMAKECONFIG_INSTALL_DIR})
242-
243-
if(NOT PYBIND11_EXPORT_NAME)
244-
set(PYBIND11_EXPORT_NAME "${PROJECT_NAME}Targets")
245-
endif()
246-
247-
install(TARGETS pybind11 module embed
248-
EXPORT "${PYBIND11_EXPORT_NAME}")
249-
250-
install(EXPORT "${PYBIND11_EXPORT_NAME}"
251-
NAMESPACE "pybind11::"
252-
DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
202+
install(DIRECTORY ${PYBIND11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
203+
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
204+
set(PYBIND11_CMAKECONFIG_INSTALL_DIR
205+
"share/cmake/${PROJECT_NAME}"
206+
CACHE STRING "install path for pybind11Config.cmake")
207+
208+
configure_package_config_file(
209+
tools/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
210+
INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
211+
212+
if(CMAKE_VERSION VERSION_LESS 3.14)
213+
# Remove CMAKE_SIZEOF_VOID_P from ConfigVersion.cmake since the library does
214+
# not depend on architecture specific settings or libraries.
215+
set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
216+
unset(CMAKE_SIZEOF_VOID_P)
217+
218+
write_basic_package_version_file(
219+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
220+
VERSION ${PROJECT_VERSION}
221+
COMPATIBILITY AnyNewerVersion)
222+
223+
set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
224+
else()
225+
# CMake 3.14+ natively supports header-only libraries
226+
write_basic_package_version_file(
227+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
228+
VERSION ${PROJECT_VERSION}
229+
COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT)
230+
endif()
231+
232+
install(
233+
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
234+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
235+
tools/FindPythonLibsNew.cmake tools/pybind11Tools.cmake
236+
DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
237+
238+
if(NOT PYBIND11_EXPORT_NAME)
239+
set(PYBIND11_EXPORT_NAME "${PROJECT_NAME}Targets")
240+
endif()
241+
242+
install(TARGETS pybind11 module embed EXPORT "${PYBIND11_EXPORT_NAME}")
243+
244+
install(
245+
EXPORT "${PYBIND11_EXPORT_NAME}"
246+
NAMESPACE "pybind11::"
247+
DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
253248
endif()

0 commit comments

Comments
 (0)