Skip to content

Commit

Permalink
use makefile instead of ninja for building
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Oct 27, 2016
1 parent 8071441 commit 45dd055
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions scripts/ci/common.sh
Expand Up @@ -24,11 +24,4 @@ echo "NUMTHREADS = $NUMTHREADS"
#NUMTHREADS=1 # disable MP
export NUMTHREADS

# pdal_test segfaults when built against external g++-built boost,
# and I haven't found a good boost package built with clang yet
if [[ "$CXX" == "clang++" ]]
then
export PDAL_CMAKE_GENERATOR="Ninja"
else
export PDAL_CMAKE_GENERATOR="Unix Makefiles"
fi
export PDAL_CMAKE_GENERATOR="Unix Makefiles"
2 changes: 1 addition & 1 deletion scripts/ci/script.sh
Expand Up @@ -51,7 +51,7 @@ cmake \

cmake ..

MAKECMD=ninja
MAKECMD=make

# Don't use ninja's default number of threads becuase it can
# saturate Travis's available memory.
Expand Down

0 comments on commit 45dd055

Please sign in to comment.