Merge pull request #63 from SCIP-Interfaces/rs/scip500

Update to SCIP 5.0.0

.travis.yml

@@ -11,10 +11,14 @@ dist: trusty
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - julia -e 'Pkg.clone(pwd())'
-  - wget http://scip.zib.de/download/release/scipoptsuite-4.0.0.tgz
-  - tar xzf scipoptsuite-4.0.0.tgz
-  - cd scipoptsuite-4.0.0/
-  - make SHARED=true GMP=false READLINE=false ZLIB=false scipoptlib
-  - export SCIPOPTDIR=`pwd`
+  - wget http://scip.zib.de/download/release/scipoptsuite-5.0.0.tgz
+  - tar xzf scipoptsuite-5.0.0.tgz
+  - cd scipoptsuite-5.0.0/
+  - export SCIPOPTDIR=`pwd`/install
+  - mkdir build
+  - cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=$SCIPOPTDIR ..
+  - make
+  - make install
   - cd ..
   - julia -e 'Pkg.build("SCIP"); Pkg.test("SCIP"; coverage=true)'

README.md

@@ -25,21 +25,26 @@ but there is an issue (#46) since the update to SCIP 4.0.0.
 
 Follow the steps below to get SCIP.jl working. Unfortunately, these steps can not be automated as part of `Pkg.build("SCIP")`, because the academic license of SCIP does not allow distribution of the source code without tracking the download metadata. See the [license](http://scip.zib.de/academic.txt) for details.
 
-1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed in the newest version (4.0.0).
-[Download](http://scip.zib.de/download.php?fname=scipoptsuite-4.0.0.tgz) the SCIP Optimization Suite, untar it.
+1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed in the newest version (5.0.0).
+[Download](http://scip.zib.de) the SCIP Optimization Suite.
 ```
-wget http://scip.zib.de/download/release/scipoptsuite-4.0.0.tgz
-tar xzf scipoptsuite-4.0.0.tgz
+tar xzf scipoptsuite-5.0.0.tgz
 ```
-2.Build the shared library with
+
+2.Choose an installation path and set the **environment variable `SCIPOPTDIR`** to point there.
 ```
-make SHARED=true GMP=false READLINE=false ZLIB=false scipoptlib
+export SCIPOPTDIR=`my/install/dir`
 ```
 
-3.Set the **environment variable `SCIPOPTDIR`** to point to the directory that contains the `scipoptsuite` sources. CSIP needs the library in `${SCIPOPTDIR}/lib/scipoptlib.so` and the C header files in `${SCIPOPTDIR}/scip-*/src/`.
+3.Build and install the shared library with
 ```
-export SCIPOPTDIR=`pwd`
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=$SCIPOPTDIR ..
+make
+make install
 ```
+
 4.This package is registered in `METADATA.jl` and can be installed in Julia with
 ```
 Pkg.add("SCIP")

deps/csip_version.jl

@@ -1,5 +1,5 @@
 # required version and utilities in a single location
-CSIP_VERSION = "0.4.5"
+CSIP_VERSION = "0.5.0"
 
 function vn2int(vn::VersionNumber)
     100*vn.major + 10*vn.minor + vn.patch

test/runtests.jl

@@ -20,7 +20,7 @@ lp_solvers = []
 ip_solvers = [solver]
 sos_solvers = [solver]
 quad_solvers = []
-quad_mip_solvers = [solver]
+quad_mip_solvers = []
 lazy_solvers = [solver]
 lazy_soc_solvers = [solver]
 lazylocal_solvers = []