Skip to content

Commit

Permalink
Travis: build TuttleOFX WITHOUT_NUMPY
Browse files Browse the repository at this point in the history
Because by default on Travis, numpy-dev package is not 1.8 (what we need).
Issue tuttleofx#433
  • Loading branch information
Clement Champetier committed Jul 20, 2015
1 parent c3a588a commit a3227d7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/TuttleMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ endfunction(tuttle_get_path_to_install_python)
# Install dynamic libraries in the TUTTLE/lib folder
function(tuttle_install_shared_libs LIBRARIES)
foreach(lib ${LIBRARIES})
# Is is a shared library ?
if (${lib} MATCHES ".*\\.so.*")
# Is it a shared library?
if(${lib} MATCHES ".*\\.so.*")
get_filename_component(realpath ${lib} REALPATH)
tuttle_get_library_soname(${realpath} SONAME)
message("will copy and rename ${realpath} to ${SONAME}")
Expand Down
1 change: 1 addition & 0 deletions libraries/tuttle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ if (TuttleBoost_FOUND)
# Numpy
if(WITHOUT_NUMPY)
# Add swig flag to create binding without Numpy
message("Build TuttleOFX python binding without numpy module.")
set(SWIG_NUMPY_FLAG "-DWITHOUT_NUMPY")
else()
# Find numpy headers
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi

# Build tuttle
cmake --version
cmake -DTUTTLE_EXPERIMENTAL=True -DCMAKE_INSTALL_PREFIX=${TUTTLE_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH ..
cmake -DTUTTLE_EXPERIMENTAL=True -DCMAKE_INSTALL_PREFIX=${TUTTLE_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DWITHOUT_NUMPY=True ..
make -j${CI_NODE_TOTAL} -k
make install
cd ..
2 changes: 1 addition & 1 deletion tools/travis/launch_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi

# nosetests
ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data
nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v --exclude-dir="numpy"

# boost unit tests
ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/testBin/TuttleOFX-data
Expand Down

0 comments on commit a3227d7

Please sign in to comment.