Skip to content

Commit

Permalink
maintainer: propagate manually added cxx flags to nvcc.
Browse files Browse the repository at this point in the history
  • Loading branch information
KaiSzuttor committed May 24, 2019
1 parent 9ab5cb9 commit 6384298
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion maintainer/CI/build_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,14 @@ fi
if [ -z "$cxx_flags" ]; then
if $with_coverage; then
cxx_flags="-Og"
nvcc_flags="-G"
else
if $run_checks; then
cxx_flags="-O3"
nvcc_flags="-O3"
else
cxx_flags="-O0"
nvcc_flags="-O0"
fi
fi
fi
Expand All @@ -90,7 +93,7 @@ if [ ! -z ${with_coverage+x} ]; then
fi

cmake_params="-DCMAKE_BUILD_TYPE=$build_type -DPYTHON_EXECUTABLE=$(which python$python_version) -DWARNINGS_ARE_ERRORS=ON -DTEST_NP:INT=$check_procs $cmake_params -DWITH_SCAFACOS=ON"
cmake_params="$cmake_params -DCMAKE_CXX_FLAGS=$cxx_flags -DCUDA_NVCC_FLAGS=$cxx_flags"
cmake_params="$cmake_params -DCMAKE_CXX_FLAGS=$cxx_flags -DCUDA_NVCC_FLAGS=$nvcc_flags"
cmake_params="$cmake_params -DCMAKE_INSTALL_PREFIX=/tmp/espresso-unit-tests"
cmake_params="$cmake_params -DTEST_TIMEOUT=$test_timeout"
if $with_ccache; then
Expand Down

0 comments on commit 6384298

Please sign in to comment.