Merge pull request #38 from SCIP-Interfaces/fs/scip5

prepare CSIP for next release

Makefile

@@ -21,15 +21,15 @@ CSIPLIBDIR 	= $(CSIPDIR)/lib
 CFLAGS 		= -std=c99 -Wall -pedantic
 
 SCIPSRC 	= $(CSIPLIBDIR)/include
-SCIPLIB 	= -lscipopt
+SCIPLIB 	= -lscip
 
 FLAGS 		= -I$(SCIPSRC) -I$(CSIPINC)
 LFLAGS 		= -L$(CSIPLIBDIR)
 LINKFLAGS 	= -Wl,-rpath,$(CSIPLIBDIR)
 
 TESTDIR 	= $(CSIPDIR)/test
 TESTFLAGS 	= -I$(CSIPINC) -g
-TESTLIBS 	= -lm -lcsip -lscipopt
+TESTLIBS 	= -lm -lcsip -lscip
 LINKTESTFLAGS 	= $(LINKFLAGS)
 LINKTESTFLAGS 	+= -Wl,-rpath,$(CSIPLIBDIR)
 LTESTFLAGS 	= -L$(CSIPLIBDIR)
@@ -67,9 +67,9 @@ test:
 links:
 	@echo "Creating symbolic links to headers and library within SCIPOPTDIR ($(SCIPOPTDIR))."
 	@bash -c 'cd lib; \
-		if [ -e $(SCIPOPTDIR)/scip*/src/scip/scip.h ] ; \
+		if [ -e $(SCIPOPTDIR)/include/scip/scip.h ] ; \
 		then \
-			ln -s $(SCIPOPTDIR)/scip*/src include; \
+			ln -s $(SCIPOPTDIR)/include; \
 		else \
 			echo "ERROR: no SCIP headers found in SCIPOPTDIR!" ; \
 			cd ..; \
@@ -79,9 +79,9 @@ links:
 		cd ..;\
 		'
 	@bash -c 'cd lib; \
-		if [ -e $(SCIPOPTDIR)/lib/libscipopt.so ] ; \
+		if [ -e $(SCIPOPTDIR)/lib/libscip.so ] ; \
 		then \
-			ln -s $(SCIPOPTDIR)/lib/libscipopt.so; \
+			ln -s $(SCIPOPTDIR)/lib/libscip* .; \
 		else \
 			echo "ERROR: no SCIP library found in SCIPOPTDIR!" ; \
 			cd ..; \

README.md

@@ -21,21 +21,19 @@ single callback function.
 ### SCIP and SoPlex
 
 CSIP depends on the [SCIP Optimization Suite](http://scip.zib.de/#scipoptsuite).
-Starting with release 0.4.0, **CSIP only supports SCIP Optimization Suite
-4.0.0** or newer.
-
-[Download](http://scip.zib.de/download.php?fname=scipoptsuite-4.0.0.tgz)
-and extract the source files, then build the shared library
-(containing SCIP and SoPlex) with
-
-    make SHARED=true GMP=false READLINE=false ZLIB=false scipoptlib
-
-which will produce a file `libscipopt.so`.
-
-To build CSIP, 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/`.
+Starting with release 0.5.0, **CSIP only supports SCIP Optimization Suite
+5.0.0** or newer.
+
+[Download](http://scip.zib.de/download.php?fname=scipoptsuite-5.0.0.tgz) the
+SCIP Optimization Suite and extract the source files. Now choose a destination
+path for the installation and set the environment variable `SCIPOPTDIR` there.
+Build the shared library (containing SCIP and SoPlex) using `cmake` via
+
+    mkdir build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=$SCIPOPTDIR ..
+    make
+    make install
 
 ### CSIP
 

src/csip.c

@@ -8,8 +8,8 @@
 #include "scip/scipdefplugins.h"
 
 #define CSIP_MAJOR_VERSION 0
-#define CSIP_MINOR_VERSION 4
-#define CSIP_PATCH_VERSION 5
+#define CSIP_MINOR_VERSION 5
+#define CSIP_PATCH_VERSION 0
 
 /* objective type */
 typedef int CSIP_OBJTYPE;