diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/CMakeLists.txt b/branches/ParadisEO-GPU/paradiseo-gpu/CMakeLists.txt
index 7d9225e79..2d1870567 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/CMakeLists.txt
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/CMakeLists.txt
@@ -9,10 +9,10 @@ PROJECT(Paradiseo-GPU)
 
 SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE)
 SET(PACKAGE_NAME "ParadisEO-GPU - Moving Objects GPU" CACHE STRING "Package name" FORCE)
-SET(PACKAGE_STRING "ParadisEO-GPU 1.0" CACHE STRING "GPU Package string full name" FORCE)
-SET(PACKAGE_VERSION "1.0" CACHE STRING "Package version" FORCE)
-SET(GLOBAL_VERSION "1.0" CACHE STRING "Global version" FORCE)
-SET(VERSION "1.0.0" CACHE STRING "Version" FORCE)
+SET(PACKAGE_STRING "ParadisEO-GPU 1.1" CACHE STRING "GPU Package string full name" FORCE)
+SET(PACKAGE_VERSION "1.1" CACHE STRING "Package version" FORCE)
+SET(GLOBAL_VERSION "1.1" CACHE STRING "Global version" FORCE)
+SET(VERSION "1.1.0" CACHE STRING "Version" FORCE)
 
 # regular expression checking
 INCLUDE_REGULAR_EXPRESSION("^.*$" "^$")
@@ -61,19 +61,7 @@ INCLUDE(FindDoxygen)
 INCLUDE(CheckLibraryExists)
                
 INCLUDE(Dart OPTIONAL) 
-                           
-# Set a special flag if the environment is windows (should do the same in a config.g file)
-IF (WIN32)
-	ADD_DEFINITIONS(-D_WINDOWS=1)
-ENDIF (WIN32)
 
-######################################################################################
-
-	#########################
-	# Manage the build type #
-	#########################
-
-# the user should choose the build type on windows environments,excepted under cygwin (default=none)
 SET(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "Variable that stores the default CMake build type" FORCE)
 
 FIND_PROGRAM(MEMORYCHECK_COMMAND
@@ -89,35 +77,16 @@ IF(NOT CMAKE_BUILD_TYPE)
            FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)  
   
-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)
+      IF(CMAKE_COMPILER_IS_GNUCXX)
        SET(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -O2 -g -pg -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)
 
 IF(CMAKE_BUILD_TYPE MATCHES Debug)
     ADD_DEFINITIONS(-DCMAKE_VERBOSE_MAKEFILE=ON)
 ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
 
-EXECUTE_PROCESS(
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			${PARADISEO_GPU_SRC_DIR}/CTestCustom.cmake
-			${PARADISEO_GPU_BIN_DIR}/CTestCustom.cmake)
 ##########################################################################################################################################
 ######################################################################################
 ### 3) Link the librairies for your executable