changed to and added SAGE_LOCAL -D for zlib, readline and bliss

sagemath · Apr 17, 2018 · 353fcc2 · 353fcc2
1 parent e18fe9b
commit 353fcc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/pkgs/scipoptsuite/spkg-check b/build/pkgs/scipoptsuite/spkg-check
@@ -9,7 +9,7 @@ cd src/build/
 echo "Now running the SCIP test suite..."
 # Do the tests with the installed version of SCIP.
 # (The uninstalled ones do not work because we did not adjust their library dependencies.)
-$MAKE check MAINFILE="$SAGE_LOCAL"/bin/scip | tee testsuite.log
+$MAKE test  | tee testsuite.log
 if [ $? -ne 0 ]; then
     echo >&2 "Error: The SCIP test suite failed with an error status."
     exit 1

diff --git a/build/pkgs/scipoptsuite/spkg-install b/build/pkgs/scipoptsuite/spkg-install
@@ -9,7 +9,7 @@ echo "Building scipoptsuite with cmake"
 cd src
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX="$SAGE_LOCAL"/ -DCMAKE_VERBOSE_MAKEFILE=ON -DGMP_DIR=${SAGE_LOCAL}
+cmake .. -DCMAKE_INSTALL_PREFIX="$SAGE_LOCAL"/ -DCMAKE_VERBOSE_MAKEFILE=ON -DGMP_DIR=${SAGE_LOCAL} -DZLIB_ROOT=$SAGE_LOCAL -DReadline_ROOT_DIR=${SAGE_LOCAL} -DBLISS_DIR=${SAGE_LOCAL}
 make
 make install