Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
pybind11
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
pybind11
Commits
90707b46
Unverified
Commit
90707b46
authored
Oct 27, 2021
by
Henry Schreiner
Committed by
GitHub
Oct 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(build): support conan's multiple includes of all files (#3420)
parent
e7e2c79f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
tools/pybind11Common.cmake
+1
-0
tools/pybind11NewTools.cmake
+6
-4
tools/pybind11Tools.cmake
+5
-0
No files found.
tools/pybind11Common.cmake
View file @
90707b46
...
...
@@ -20,6 +20,7 @@ Adds the following functions::
#]======================================================]
# CMake 3.10 has an include_guard command, but we can't use that yet
# include_guard(global) (pre-CMake 3.10)
if
(
TARGET pybind11::lto
)
return
()
endif
()
...
...
tools/pybind11NewTools.cmake
View file @
90707b46
...
...
@@ -5,6 +5,12 @@
# All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
if
(
CMAKE_VERSION VERSION_LESS 3.12
)
message
(
FATAL_ERROR
"You cannot use the new FindPython module with CMake < 3.12"
)
endif
()
include_guard
(
GLOBAL
)
get_property
(
is_config
TARGET pybind11::headers
...
...
@@ -16,10 +22,6 @@ else()
set
(
_pybind11_quiet
""
)
endif
()
if
(
CMAKE_VERSION VERSION_LESS 3.12
)
message
(
FATAL_ERROR
"You cannot use the new FindPython module with CMake < 3.12"
)
endif
()
if
(
NOT Python_FOUND
AND NOT Python3_FOUND
AND NOT Python2_FOUND
)
...
...
tools/pybind11Tools.cmake
View file @
90707b46
...
...
@@ -5,6 +5,11 @@
# All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# include_guard(global) (pre-CMake 3.10)
if
(
TARGET pybind11::python_headers
)
return
()
endif
()
# Built-in in CMake 3.5+
include
(
CMakeParseArguments
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment