default to make, not ninja

PDAL · Oct 24, 2016 · 4af6109 · 4af6109
1 parent 0104546
commit 4af6109
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
@@ -26,9 +26,6 @@ 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"
+
+#    export PDAL_CMAKE_GENERATOR="Unix Makefiles"
diff --git a/scripts/ci/script.sh b/scripts/ci/script.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # Builds and tests PDAL
 
-clang --version
+$(CXX) --version
 
 cd /pdal
 source ./scripts/ci/common.sh
@@ -50,7 +50,7 @@ cmake \
 
 cmake ..
 
-MAKECMD=ninja
+MAKECMD=make
 
 # Don't use ninja's default number of threads becuase it can
 # saturate Travis's available memory.
@@ -68,7 +68,7 @@ if [ "${OPTIONAL_COMPONENT_SWITCH}" == "ON" ]; then
     echo "current path: " `pwd`
     export PDAL_TEST_DIR=/pdal/_build/test
     python setup.py test
-    
+
     # Build all examples
     for EXAMPLE in writing writing-filter writing-kernel writing-reader writing-writer
     do