Merge branch 'master' of github.com:arnaud-m/opossum into visu

.gitignore

@@ -22,6 +22,6 @@ Thumbs.db
 # lib
 #*.so*
 *.lib
-*.a
+#*.a
 *.la
 

CMakeLists.txt

@@ -3,7 +3,7 @@
 #export ILOG_LICENSE_FILE=access.ilm
 
 ################ Project Properties ####################
-CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5)
 PROJECT (opossum)
 SET (APPLICATION_NAME "OPOSSUM")
 SET (APPLICATION_CODENAME "${PROJECT_NAME}")
@@ -186,7 +186,6 @@ if(BUILD_TESTS)
     message(STATUS "Building Test")
 endif (BUILD_TESTS)
 
-
 #################### Add Install Targets #################### 
 IF (EXISTS "${MAINFOLDER}/include/${PROJECT_NAME}" AND IS_DIRECTORY "${MAINFOLDER}/include/${PROJECT_NAME}")
     INSTALL(DIRECTORY "${MAINFOLDER}/include/${PROJECT_NAME}" DESTINATION "include")
@@ -195,3 +194,12 @@ ENDIF (EXISTS "${MAINFOLDER}/include/${PROJECT_NAME}" AND IS_DIRECTORY "${MAINFO
 #################### Add Documentation Targets #################### 
 INCLUDE (DocumentationTargets)
 
+#ADD MODULE (Cotire to speedup the build)
+set (CMAKE_MODULE_PATH "${MAINFOLDER}/tools/share/cmake")
+include(cotire)
+
+#Add Executable with cotire to speed up building
+#!IMPORTANT : Add All Executables at the end otherwise it does not work with cotire 
+cotire(${PROJECT_NAME})
+cotire(${PROJECT_NAME}-tests)
+

README

@@ -39,16 +39,53 @@
  7. CONTRIBUTING
 
 == 1. PREREQUISITES ==
-
+ This project works on 32 bits and 64 bits environment. 
  This project requires:
+
   * Cross-platform Make (CMake) v2.6.2+
+  	> Fedora :
+	  	yum install cmake
+  	> Ubuntu :
+ 		apt-get install cmake
+
   * GNU Make or equivalent.
+  	> Fedora :
+  		yum install make
+  	> Ubuntu :
+ 		apt-get install make	
+
   * GCC or an alternative, reasonably conformant C++ compiler.
-  * CPLEX [HEADERS and LIBRARIES] with licence (32 bits)
-  * Boost C++ Libraries v1.37+ [HEADERS and LIBRARIES] (32 bits)
-  * GEXF Library v0.1.2 (32 bits)
-  * XML2 Library v2.0+ (32 bits)
-
+  	> Fedora :
+  		yum groupinstall "Development Tools"
+  	> Ubuntu :
+ 		apt-get install build-essential	
+
+  * Boost C++ Libraries v1.37+ [HEADERS and LIBRARIES]
+ 	> Fedora :
+ 		yum install boost-devel
+  	> Ubuntu :
+ 		apt-get install libboost-dev
+
+  * XML2 Library v2.0+
+  	> Fedora :
+  		yum install libxml2-devel
+  	> Ubuntu :
+ 		apt-get install libxml2-dev
+
+  * GLPK Library
+  	> Fedora :
+  		yum install glpk-devel
+  	> Ubuntu :
+ 		apt-get install libglpk-dev
+
+  * LPSOLVE Library v5.5+
+  	> Fedora :
+  		yum install suitesparse-devel
+  	> Ubuntu :
+ 		apt-get install liblpsolve55-dev
+
+   * CPLEX [HEADERS and LIBRARIES] with licence
+
 == 2. BUILDING ==
 
  This project uses the Cross-platform Make (CMake) build system. However, we