Squashed 'wrap/' changes from a9ad4f504..8770e3c7e

8770e3c7e Merge pull request #20 from borglab/fix/pybind-include 8c3c83618 proper placement of pybind11 include git-subtree-dir: wrap git-subtree-split: 8770e3c7eaa11819f143c11a455092b34c7289a0
borglab · Jan 2, 2021 · 746f6bb · 746f6bb
1 parent 3315726
commit 746f6bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmake/PybindWrap.cmake b/cmake/PybindWrap.cmake
@@ -1,5 +1,8 @@
 set(PYBIND11_PYTHON_VERSION ${WRAP_PYTHON_VERSION})
 
+# Load the pybind11 code from the library installation path
+add_subdirectory(${CMAKE_INSTALL_FULL_LIBDIR}/pybind11 pybind11)
+
 # User-friendly Pybind11 wrapping and installing function.
 # Builds a Pybind11 module from the provided interface_header.
 # For example, for the interface header gtsam.h, this will

diff --git a/cmake/gtwrapConfig.cmake b/cmake/gtwrapConfig.cmake
@@ -15,9 +15,6 @@ include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 include(CMakeDependentOption)
 
-# Load the pybind11 code from the library installation path
-add_subdirectory(${CMAKE_INSTALL_FULL_LIBDIR}/pybind11 pybind11)
-
 # Load all the CMake scripts from the standard location
 include(${SCRIPT_INSTALL_DIR}/gtwrap/PybindWrap.cmake)
 include(${SCRIPT_INSTALL_DIR}/gtwrap/GtwrapUtils.cmake)