Skip to content

Commit

Permalink
Merge pull request #79 from pariterre/dev
Browse files Browse the repository at this point in the history
ReadMe correction
  • Loading branch information
pariterre authored Oct 7, 2019
2 parents 6619a12 + 31ea6ce commit 465c2bf
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 62 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ after_success:
bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports";
fi

# # Code coverage for python (Not sure yet how to merge the two results)
# if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# conda install -c conda-forge codecov;
# codecov;
# fi

notifications:
email:
on_success: never
Expand Down
101 changes: 50 additions & 51 deletions README.md

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions binding/python3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ include_directories(${NUMPY_INCLUDES})
if(WIN32)
link_directories(${Python3_RUNTIME_LIBRARY_DIRS}/libs)
endif()
if (APPLE)
# For unknown reason the later set properties over SWIG_INCLUDE_DIRECTORIES doesn't work
# on travis
include_directories(${CMAKE_SOURCE_DIR}/include)
endif ()
# For some reasons, target_include_directories later in the file sometime fails
include_directories(${CMAKE_SOURCE_DIR}/include)

# Add swig module
set(CMAKE_SWIG_FLAGS "")
Expand Down
Binary file added build2/binding/matlab/ezc3dRead.mexa64
Binary file not shown.
Binary file added build2/binding/matlab/ezc3dWrite.mexa64
Binary file not shown.
Binary file added build2/example/ezc3d_example
Binary file not shown.
Binary file added build2/example/markers_analogs.c3d
Binary file not shown.
Binary file added build2/libezc3d.so
Binary file not shown.

0 comments on commit 465c2bf

Please sign in to comment.