find NumPy module inside pybind11 (RobotLocomotion#5158)

* let pybind11 find NumPy because it has the correct cmake module path * update pybind11 to get find_dependency * pybind11Config is difficult * fix whitespace * try to update to upstream pybind11 lto fixes * fix typo which was causing mac type lookup failure * fix one more pybind11 version error
trigrass2 · Feb 15, 2017 · f678a55 · f678a55
1 parent b2fefb5
commit f678a55
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -156,7 +156,6 @@ macro(drake_find_packages)
   drake_find_package(meshconverters CONFIG)
   drake_find_package(mosek CONFIG)
   drake_find_package(NLopt CONFIG)
-  drake_find_package(NumPy CONFIG)
   drake_find_package(octomap CONFIG)
   drake_find_package(pybind11 CONFIG)
   drake_find_package(robotlocomotion-lcmtypes CONFIG)

diff --git a/drake/bindings/pybind11/CMakeLists.txt b/drake/bindings/pybind11/CMakeLists.txt
@@ -21,5 +21,5 @@ install(TARGETS _pydrake_autodiffutils DESTINATION ${PYDRAKE_INSTALL_DIR})
 
 pybind11_add_module(_pydrake_ik pydrake_ik.cc)
 target_link_libraries(_pydrake_ik PRIVATE drakeIK Eigen3::Eigen)
-target_compile_options(_pydrake_autodiffutils PRIVATE "-fvisibility=default")
+target_compile_options(_pydrake_ik PRIVATE "-fvisibility=default")
 install(TARGETS _pydrake_ik DESTINATION ${PYDRAKE_INSTALL_DIR}/solvers)
diff --git a/externals/pybind11 b/externals/pybind11
+6 −1		.travis.yml
+6 −1		CMakeLists.txt
+17 −0		ISSUE_TEMPLATE.md
+2 −127		README.md
+1 −0		docs/advanced/cast/index.rst
+12 −0		docs/advanced/cast/overview.rst
+243 −0		docs/advanced/cast/strings.rst
+2 −0		docs/advanced/classes.rst
+84 −0		docs/advanced/functions.rst
+1 −0		docs/environment.yml
+19 −27		include/pybind11/attr.h
+197 −110		include/pybind11/cast.h
+9 −0		include/pybind11/common.h
+3 −1		include/pybind11/complex.h
+7 −5		include/pybind11/numpy.h
+79 −25		include/pybind11/pybind11.h
+4 −4		include/pybind11/pytypes.h
+20 −12		setup.py
+1 −1		tests/CMakeLists.txt
+1 −2		tests/test_issues.cpp
+116 −12		tests/test_methods_and_attributes.cpp
+78 −2		tests/test_methods_and_attributes.py
+2 −1		tests/test_opaque_types.py
+42 −0		tests/test_python_types.cpp
+91 −0		tests/test_python_types.py
+62 −58		tools/pybind11Tools.cmake