Skip to content

Commit

Permalink
Update Travis.yml + gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
jrmadsen committed Jan 20, 2018
1 parent 4c3817a commit d069e92
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# QtCreater generated file
CMakeLists.txt.user

# build folders
/build-*
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,21 @@ before_install:
- eval "${MATRIX_EVAL}"
- export CC=${CC}
- export CXX=${CXX}
- echo "CC = ${CC} $(${CC} -dumpversion)"
- echo "CXX = ${CXX} $(${CXX} -dumpversion)"
- export ENABLE_OMP=${ENABLE_OMP}
- export ENABLE_TBB=${ENABLE_TBB}
- export ENABLE_SSE=${ENABLE_SSE}
- export CXXSTD=${CXXSTD}
- export PYBINPATH=$(dirname $(which python))
- export PYROOTPATH=$(dirname ${PYBINPATH})
- export PATH=${PYBINPATH}:${PATH}
- export CMAKE_PREFIX_PATH=${PYROOTPATH}:${CMAKE_PREFIX_PATH}
- export PYTHON_VERSION="$(python --version | awk '{print $NF}')"
- echo "CC = ${CC} $(${CC} -dumpversion)"
- echo "CXX = ${CXX} $(${CXX} -dumpversion)"
- echo "Python = $(which python) [version ${PYTHON_VERSION}]"
- echo "PYBINPATH = ${PYBINPATH}"
- echo "PYROOTPATH = ${PYROOTPATH}"
- echo "CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}"

install:
- env
Expand All @@ -145,7 +154,7 @@ install:
-DBUILD_CXXSTD=${CXXSTD} -DENABLE_UNIT_TEST=ON
-DUSE_TBB=${ENABLE_TBB} -DUSE_OPENMP=${ENABLE_OMP}
-DUSE_TCMALLOC=OFF -DUSE_SSE=${ENABLE_SSE}
-DUSE_PYBIND11=ON ${PWD}/..
-DUSE_PYBIND11=ON -DPYTHON_EXECUTABLE=$(which python) ${PWD}/..
- grep '^[A-Za-z]' CMakeCache.txt | grep -vi advanced
- make -j2

Expand Down

0 comments on commit d069e92

Please sign in to comment.