Skip to content

Commit

Permalink
Squashed 'wrap/' changes from 3eff76f60..548e61b1f
Browse files Browse the repository at this point in the history
548e61b1f Merge pull request #57 from borglab/fix/configurable-matlab-include
b58eabaf1 set correct template file path
483cdab9c fix
1f393516d fix CI syntax
8f0a3543f more concise cmake command because we don't care about the extra files generated
641ad1326 update CI to run cmake
de6b9260f added CMake variable to configure the include directory for matlab.h
cbe5f18bc Merge pull request #54 from borglab/feature/refactor2
cc78ee3bb test formatting
046a50b01 break down interface_parser into a submodule of smaller parts

git-subtree-dir: wrap
git-subtree-split: 548e61b1fbf02759d2e4a52435c2f1b3cbde98f0
  • Loading branch information
varunagrawal committed Mar 24, 2021
1 parent 58a9622 commit 66d3b95
Show file tree
Hide file tree
Showing 19 changed files with 1,144 additions and 974 deletions.
1 change: 1 addition & 0 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- name: Build and Test
run: |
cmake .
cd tests
# Use Pytest to run all the tests.
pytest
2 changes: 2 additions & 0 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
- name: Build and Test
run: |
cmake .
cd tests
# Use Pytest to run all the tests.
pytest
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ __pycache__/
*.egg-info

# Files related to code coverage stats
**/.coverage
**/.coverage

gtwrap/matlab_wrapper.tpl
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ else()
set(SCRIPT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake")
endif()

# Configure the include directory for matlab.h
# This allows the #include to be either gtwrap/matlab.h, wrap/matlab.h or something custom.
if(NOT DEFINED GTWRAP_INCLUDE_NAME)
set(GTWRAP_INCLUDE_NAME "gtwrap" CACHE INTERNAL "Directory name for Matlab includes")
endif()
configure_file(${PROJECT_SOURCE_DIR}/templates/matlab_wrapper.tpl.in ${PROJECT_SOURCE_DIR}/gtwrap/matlab_wrapper.tpl)

# Install CMake scripts to the standard CMake script directory.
install(FILES cmake/gtwrapConfig.cmake cmake/MatlabWrap.cmake
cmake/PybindWrap.cmake cmake/GtwrapUtils.cmake
Expand Down
Loading

0 comments on commit 66d3b95

Please sign in to comment.