Skip to content

Commit ef6403d

Browse files
authored
Merge pull request #19 from pariterre/master
Test travis
2 parents d068c90 + af3a630 commit ef6403d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@ before_install:
4040
- conda config --set auto_update_conda no
4141
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then conda update -q conda; fi
4242
- source activate
43+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
44+
xcode-select --install;
45+
fi
4346

4447
install:
4548
# Install test packages for Python3
4649
- conda install python pytest numpy swig
4750
- conda install boost eigen
4851
- conda install dlib rbdl -cpyomeca
49-
52+
5053
script:
5154
############################################################################
5255
# Build main and tests
@@ -56,10 +59,10 @@ script:
5659
- cd build
5760
# Test if biorbd can be compile with the python binder
5861
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
59-
cmake ${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=$HOME/miniconda/ -DCMAKE_CXX_FLAGS=${CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_EXAMPLE=OFF -DBINDER_PYTHON3=ON ..;
62+
cmake ${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=$HOME/miniconda/ -DCMAKE_CXX_FLAGS=${CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLE=OFF -DBINDER_PYTHON3=ON ..;
6063
make install;
6164
else
62-
cmake -G"Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=$ToolsDir/miniconda3/ -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_EXAMPLE=OFF -DBINDER_PYTHON3=ON ..;
65+
cmake -G"Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=/c/tools/miniconda3/ -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLE=OFF -DBINDER_PYTHON3=ON ..;
6366
cmake --build ./ --config Release --target install;
6467
fi
6568

binding/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
option(BINDER_PYTHON3 "Build Python SWIG module" OFF)
33
option(BINDER_MATLAB "Build Matlab module" OFF)
4-
4+
55
# If at least one interface
66
if (BINDER_PYTHON3)
77
# Set up swig

0 commit comments

Comments
 (0)