diff --git a/contribution/branches/MOLS/CMakeLists.txt b/contribution/branches/MOLS/CMakeLists.txt
index 5f93cc1b4..8ee57041b 100644
--- a/contribution/branches/MOLS/CMakeLists.txt
+++ b/contribution/branches/MOLS/CMakeLists.txt
@@ -8,6 +8,8 @@ PROJECT(MOLS)
 # check cmake version compatibility
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+INCLUDE(CMakeBackwardCompatibilityCXX)
+
 # regular expression checking
 INCLUDE_REGULAR_EXPRESSION("^.*$" "^$")
 
@@ -19,6 +21,46 @@ INCLUDE(Dart OPTIONAL)
 
 #####################################################################################
 
+SET(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "Variable that stores the default CMake build type" FORCE)
+
+FIND_PROGRAM(MEMORYCHECK_COMMAND
+    NAMES purify valgrind
+    PATHS
+    "/usr/local/bin /usr/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]"
+    DOC "Path to the memory checking command, used for memory error detection.") 
+
+IF(NOT CMAKE_BUILD_TYPE)
+     SET( CMAKE_BUILD_TYPE 
+          ${CMAKE_DEFAULT_BUILD_TYPE} CACHE STRING 
+          "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." 
+           FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+
+IF(CMAKE_BUILD_TYPE MATCHES Debug)
+    ADD_DEFINITIONS(-DCMAKE_VERBOSE_MAKEFILE=ON)
+ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
+
+IF(WIN32 AND NOT CYGWIN)
+  IF(CMAKE_CXX_COMPILER MATCHES cl)
+   IF(NOT WITH_SHARED_LIBS)
+     IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+       SET(CMAKE_CXX_FLAGS "/nologo /Gy")
+       SET(CMAKE_CXX_FLAGS_DEBUG "/W3 /MTd /Z7 /Od")
+       SET(CMAKE_CXX_FLAGS_RELEASE "/w /MT /O2 /wd4530")
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
+       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")  
+      ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+   ENDIF(NOT WITH_SHARED_LIBS)
+  ENDIF(CMAKE_CXX_COMPILER MATCHES cl)  
+ELSE(WIN32 AND NOT CYGWIN)
+    IF(CMAKE_COMPILER_IS_GNUCXX)
+       SET(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fprofile-arcs -ftest-coverage -Wall -Wextra -Wno-unused-parameter")                       
+       SET(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O6")       
+    ENDIF(CMAKE_COMPILER_IS_GNUCXX)  
+ENDIF(WIN32 AND NOT CYGWIN)
+
 
 ######################################################################################
 ### 2) Include the main configuration variables
diff --git a/contribution/branches/MOLS/install.cmake b/contribution/branches/MOLS/install.cmake
index 87386f5c6..8a3329b90 100644
--- a/contribution/branches/MOLS/install.cmake
+++ b/contribution/branches/MOLS/install.cmake
@@ -1,8 +1,8 @@
 #  Here, specify PARADISEO_DIR : the directory where ParadisEO has been installed
-SET(PARADISEO_DIR "/home/humeau/workspace/ParadisEO" CACHE PATH "ParadisEO directory" FORCE)
+SET(PARADISEO_DIR "/home/jeremie/workspace/trunk" CACHE PATH "ParadisEO directory" FORCE)
 
 #  Here, specify SOURCES_DIR : the directory where the example sources have been deposed.
-SET(SOURCES_DIR "/home/humeau/workspace/MOLS/src" CACHE PATH "TP sources directory, where install.cmake is" FORCE)
+SET(SOURCES_DIR "/home/jeremie/workspace/MOLS/src" CACHE PATH "TP sources directory, where install.cmake is" FORCE)
 
 
 ###########################################################################################################################################
@@ -22,19 +22,3 @@ SET(PARADISEO_MOEO_BIN_DIR "${PARADISEO_DIR}/paradiseo-moeo/build" CACHE PATH "P
 
 SET(INSTALL_DIR "${SOURCES_DIR}/build" CACHE PATH "Directory where the executable will be put" FORCE)
 
-
-### OPTIONNAL: Windows advanced config - especially for Microsoft Visual Studio 9
-###########################################################################################################################################
-  IF(CMAKE_CXX_COMPILER MATCHES cl)
-   IF(NOT WITH_SHARED_LIBS)
-     IF(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-       SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy")
-       SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od")
-       SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2")
-       SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
-       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
-       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
-       
-     ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-   ENDIF(NOT WITH_SHARED_LIBS)
-  ENDIF(CMAKE_CXX_COMPILER MATCHES cl)