Skip to content

Commit 50da709

Browse files
committed
Merge branch 'master' into sh_merge_master
2 parents ac516df + fab1eeb commit 50da709

17 files changed

+1944
-713
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ pybind11Targets.cmake
4343
/pybind11/share/*
4444
/docs/_build/*
4545
.ipynb_checkpoints/
46+
tests/main.cpp

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ set(PYBIND11_HEADERS
125125
include/pybind11/complex.h
126126
include/pybind11/options.h
127127
include/pybind11/eigen.h
128+
include/pybind11/eigen/matrix.h
129+
include/pybind11/eigen/tensor.h
128130
include/pybind11/embed.h
129131
include/pybind11/eval.h
130132
include/pybind11/gil.h

include/pybind11/eigen.h

Lines changed: 1 addition & 705 deletions
Large diffs are not rendered by default.

include/pybind11/eigen/matrix.h

Lines changed: 713 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)