From 746f6bbc22db39d308823c28cf307b32bff6a2f0 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 2 Jan 2021 17:01:07 -0500 Subject: [PATCH] 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 --- cmake/PybindWrap.cmake | 3 +++ cmake/gtwrapConfig.cmake | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/PybindWrap.cmake b/cmake/PybindWrap.cmake index 8973151e4b..33b289fb35 100644 --- 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 index 61848b1243..a3e43a9cd8 100644 --- 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)