Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Switch to conda-forge and pin boost, eigen, pybind11 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brianv0 wants to merge 4 commits into
base: master
Choose a base branch
Loading
from
Draft

Switch to conda-forge and pin boost, eigen, pybind11 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b2e809
Switch to conda-forge and pin boost, eigen, pybind11
brianv0 Jul 29, 2019
daa278b
Make it boost 1.69
brianv0 Jul 29, 2019
20400f6
Add a conda list command to print out environment
brianv0 Jul 29, 2019
8fdfbfa
Switch to new CMake form for boost
brianv0 Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion 7 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,17 @@ install:
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11 cmake gxx_linux-64 eigen
- conda create -q -n test-environment
- source activate test-environment
- conda config --env --add channels conda-forge
- conda install python=$TRAVIS_PYTHON_VERSION boost=1.70.* fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.*
- conda list
- export BOOST_DIR=$CONDA_PREFIX
- export EIGEN_DIR=$CONDA_PREFIX
- export FFTW_DIR=$CONDA_PREFIX
- export CMAKE_PREFIX_PATH=$CONDA_PREFIX
# For conda-forge's old glibc
- export LDFLAGS="-lrt ${LDFLAGS}"

script:
- mkdir build
Expand Down
12 changes: 8 additions & 4 deletions 12 tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
# (4) Addition of the test executable via add_test.

### Core tests, which rely only on boost-test and ndarray.
set(Boost_NO_BOOST_CMAKE OFF)
set(Boost_USE_STATIC_LIBS OFF)
set(BUILD_SHARED_LIBS ON)

find_package(Boost COMPONENTS unit_test_framework REQUIRED)

include_directories(
Expand All @@ -17,12 +21,12 @@ include_directories(

add_executable(ndarray ndarray.cc)
add_dependencies(ndarray preprocess_includes2)
target_link_libraries(ndarray ${Boost_LIBRARIES})
target_link_libraries(ndarray Boost::unit_test_framework)
add_test(test_ndarray ndarray)

add_executable(views views.cc)
add_dependencies(views preprocess_includes2)
target_link_libraries(views ${Boost_LIBRARIES})
target_link_libraries(views Boost::unit_test_framework)
add_test(test_views views)


Expand All @@ -34,7 +38,7 @@ if(NDARRAY_EIGEN)

add_executable(ndarray-eigen ndarray-eigen.cc)
add_dependencies(ndarray-eigen preprocess_includes2)
target_link_libraries(ndarray-eigen ${Boost_LIBRARIES})
target_link_libraries(ndarray-eigen Boost::unit_test_framework)
add_test(test_ndarray_eigen ndarray-eigen)
endif(NDARRAY_EIGEN)

Expand All @@ -45,7 +49,7 @@ if(NDARRAY_FFTW)

add_executable(ndarray-fft ndarray-fft.cc)
add_dependencies(ndarray-fft preprocess_includes2)
target_link_libraries(ndarray-fft ${Boost_LIBRARIES} ${FFTW_LIBRARIES})
target_link_libraries(ndarray-fft Boost::unit_test_framework ${FFTW_LIBRARIES})
add_test(test_ndarray-fft ndarray-fft)
endif(NDARRAY_FFTW)

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.