fix: support basic dual includes #2804
Conversation
|
Wait, that's all? I was expecting this to be a horrible PR! |
|
("horrible" in the amount of code/hacks necessary to get this done, I mean; not horrible in it's implementation by you, ofc, @henryiii ;-) ) |
|
It's not horrible if one writes good CMake to begin with. ;) |
|
And, this is just to make it possible, it's not really testing to see if all the needed directory-level variables get defined per-directory. But that should hopefully only be minor tweaks on top. Hopefully @dmikushin can test. :) |
| @@ -11,7 +11,7 @@ endif() | |||
|
|
|||
| project(test_subdirectory_target CXX) | |||
|
|
|||
| add_subdirectory(${PYBIND11_PROJECT_DIR} pybind11) | |||
| add_subdirectory("${pybind11_SOURCE_DIR}" pybind11) | |||
There was a problem hiding this comment.
How are these two variables different?
There was a problem hiding this comment.
This is now the same name as the original variable, rather than being renamed, so it works when added from the main file as well.
| @@ -25,7 +25,7 @@ function(pybind11_add_build_test name) | |||
| endif() | |||
|
|
|||
| if(NOT ARG_INSTALL) | |||
| list(APPEND build_options "-DPYBIND11_PROJECT_DIR=${pybind11_SOURCE_DIR}") | |||
| list(APPEND build_options "-Dpybind11_SOURCE_DIR=${pybind11_SOURCE_DIR}") | |||
There was a problem hiding this comment.
@bstaletic this is the important bit.
| @@ -25,7 +25,7 @@ function(pybind11_add_build_test name) | |||
| endif() | |||
|
|
|||
| if(NOT ARG_INSTALL) | |||
| list(APPEND build_options "-DPYBIND11_PROJECT_DIR=${pybind11_SOURCE_DIR}") | |||
| list(APPEND build_options "-Dpybind11_SOURCE_DIR=${pybind11_SOURCE_DIR}") | |||
Description
This allows pybind11 to be included twice in CMake. It is just a basic check; it is possible some variables will need to be set again that are being skipped, but I think it mostly should work.
(Some variables are directory scoped, and IMPORT targets are as well).
Fixes #2800.
Suggested changelog entry: