From 4abed7fa08b5d3921edf8c8bed98c380058dd201 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sun, 3 Jul 2022 19:51:02 -0400 Subject: [PATCH 1/2] install the python package explicitly --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a11a76..3eadcf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,9 @@ configure_file(${PROJECT_SOURCE_DIR}/templates/matlab_wrapper.tpl.in # for wrapping. install(DIRECTORY gtwrap DESTINATION "${GTWRAP_LIB_INSTALL_DIR}") +# Also pip install the gtwrap package so it can be found on import +execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install ${PROJECT_SOURCE_DIR}) + # Install pybind11 directory to `CMAKE_INSTALL_PREFIX/lib/gtwrap/pybind11` This # will allow the gtwrapConfig.cmake file to load it later. install(DIRECTORY pybind11 DESTINATION "${GTWRAP_LIB_INSTALL_DIR}") From 886846724139a04cc9ab9aeb902234f091dbab68 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 4 Jul 2022 14:46:38 -0400 Subject: [PATCH 2/2] set the GTWRAP_PATH_SEPARATOR properly for MatlabWrap --- CMakeLists.txt | 3 --- cmake/MatlabWrap.cmake | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eadcf8..2a11a76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,6 @@ configure_file(${PROJECT_SOURCE_DIR}/templates/matlab_wrapper.tpl.in # for wrapping. install(DIRECTORY gtwrap DESTINATION "${GTWRAP_LIB_INSTALL_DIR}") -# Also pip install the gtwrap package so it can be found on import -execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install ${PROJECT_SOURCE_DIR}) - # Install pybind11 directory to `CMAKE_INSTALL_PREFIX/lib/gtwrap/pybind11` This # will allow the gtwrapConfig.cmake file to load it later. install(DIRECTORY pybind11 DESTINATION "${GTWRAP_LIB_INSTALL_DIR}") diff --git a/cmake/MatlabWrap.cmake b/cmake/MatlabWrap.cmake index 3cb0581..eaffcc0 100644 --- a/cmake/MatlabWrap.cmake +++ b/cmake/MatlabWrap.cmake @@ -242,6 +242,13 @@ function(wrap_library_internal interfaceHeader moduleName linkLibraries extraInc find_package(PythonInterp ${WRAP_PYTHON_VERSION} EXACT) find_package(PythonLibs ${WRAP_PYTHON_VERSION} EXACT) + # Set the path separator for PYTHONPATH + if(UNIX) + set(GTWRAP_PATH_SEPARATOR ":") + else() + set(GTWRAP_PATH_SEPARATOR ";") + endif() + add_custom_command( OUTPUT ${generated_cpp_file} DEPENDS ${interfaceHeader} ${module_library_target} ${otherLibraryTargets}