diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8de12dd7fe638e226ee47566b4dae9ad0c8be30..5f19e888da012505d8c1c8dbb214d00e1497e8b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,49 +28,49 @@ dailyBuildMasterAll:
         - tags
         tags:
         
-dailyBuildDynamicAndStatic:
-        image: gitlab-registry.in2p3.fr/cta-lapp/phoenix_libs/phoenix/phoenix_minimal:0.2
-        stage: BuildTestinstall
-        script:
-        - export LD_LIBRARY_PATH=/usr/lib
-        - env
-        - mkdir -p build
-        - cd build
-        - >
-                cmake ..
-                -DCMAKE_INSTALL_PREFIX=/usr
-                -DRELEASE_MODE=yes
-                -DSELF_TESTS_MODE=yes
-                -DPHOENIX_BUILD_TYPE=DynamicAndStatic
-        - make all
-        - make install
-        - make test
-        only:
-        - branches
-        - tags
-        tags:
+#dailyBuildDynamicAndStatic:
+        #image: gitlab-registry.in2p3.fr/cta-lapp/phoenix_libs/phoenix/phoenix_minimal:0.2
+        #stage: BuildTestinstall
+        #script:
+        #- export LD_LIBRARY_PATH=/usr/lib
+        #- env
+        #- mkdir -p build
+        #- cd build
+        #- >
+                #cmake ..
+                #-DCMAKE_INSTALL_PREFIX=/usr
+                #-DRELEASE_MODE=yes
+                #-DSELF_TESTS_MODE=yes
+                #-DPHOENIX_BUILD_TYPE=DynamicAndStatic
+        #- make all
+        #- make install
+        #- make test
+        #only:
+        #- branches
+        #- tags
+        #tags:
 
-dailyBuildStaticOnly:
-        image: gitlab-registry.in2p3.fr/cta-lapp/phoenix_libs/phoenix/phoenix_minimal:0.2
-        stage: BuildTestinstall
-        script:
-        - export LD_LIBRARY_PATH=/usr/lib
-        - env
-        - mkdir -p build
-        - cd build
-        - >
-                cmake ..
-                -DCMAKE_INSTALL_PREFIX=/usr
-                -DRELEASE_MODE=yes
-                -DSELF_TESTS_MODE=yes
-                -DPHOENIX_BUILD_TYPE=StaticOnly
-        - make all
-        - make install
-        - make test
-        only:
-        - branches
-        - tags
-        tags:
+#dailyBuildStaticOnly:
+        #image: gitlab-registry.in2p3.fr/cta-lapp/phoenix_libs/phoenix/phoenix_minimal:0.2
+        #stage: BuildTestinstall
+        #script:
+        #- export LD_LIBRARY_PATH=/usr/lib
+        #- env
+        #- mkdir -p build
+        #- cd build
+        #- >
+                #cmake ..
+                #-DCMAKE_INSTALL_PREFIX=/usr
+                #-DRELEASE_MODE=yes
+                #-DSELF_TESTS_MODE=yes
+                #-DPHOENIX_BUILD_TYPE=StaticOnly
+        #- make all
+        #- make install
+        #- make test
+        #only:
+        #- branches
+        #- tags
+        #tags:
 
 TestCoverage:
         image: gitlab-registry.in2p3.fr/cta-lapp/phoenix_libs/phoenix/phoenix_minimal:0.2
diff --git a/cmake/create_version.cmake b/cmake/create_version.cmake
index 8dda69a7e94b187fa430d00e447e87f0f48fe371..4c5198378288675c7fb79854673fb4d7576123f7 100644
--- a/cmake/create_version.cmake
+++ b/cmake/create_version.cmake
@@ -3,21 +3,25 @@
 #	projectName : name of the project
 #	projectVersion : version of the project
 function(create_version projectName projectVersion)
-	execute_process(COMMAND git rev-parse --verify HEAD
-			RESULTS_VARIABLE CURRENT_TIMESTAMP_OK
-			OUTPUT_VARIABLE CURRENT_TIMESTAMP
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-		
-	execute_process(COMMAND git rev-parse --abbrev-ref HEAD
-			RESULTS_VARIABLE CURRENT_BRANCH_OK
-			OUTPUT_VARIABLE CURRENT_BRANCH
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
+	find_program(GIT_PROGRAM "git")
+	
+	if(GIT_PROGRAM)
+		execute_process(COMMAND ${GIT_PROGRAM} rev-parse --verify HEAD
+				RESULTS_VARIABLE CURRENT_TIMESTAMP_OK
+				OUTPUT_VARIABLE CURRENT_TIMESTAMP
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
+			
+		execute_process(COMMAND ${GIT_PROGRAM} rev-parse --abbrev-ref HEAD
+				RESULTS_VARIABLE CURRENT_BRANCH_OK
+				OUTPUT_VARIABLE CURRENT_BRANCH
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-	execute_process(COMMAND git describe --exact-match HEAD
-			RESULTS_VARIABLE CURRENT_TAG_OK
-			OUTPUT_VARIABLE CURRENT_TAG
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-			OUTPUT_QUIET ERROR_QUIET)
+		execute_process(COMMAND ${GIT_PROGRAM} describe --exact-match HEAD
+				RESULTS_VARIABLE CURRENT_TAG_OK
+				OUTPUT_VARIABLE CURRENT_TAG
+				OUTPUT_STRIP_TRAILING_WHITESPACE
+				OUTPUT_QUIET ERROR_QUIET)
+	endif(GIT_PROGRAM)
 			
 	if(CURRENT_TIMESTAMP_OK EQUAL 0 AND CURRENT_BRANCH_OK EQUAL 0)
 		if(CURRENT_TAG_OK EQUAL 0)
@@ -68,6 +72,7 @@ function(create_version projectName projectVersion)
 	
 	if(PROGRAM_LONG_VERSION)
 		set(PROGRAM_VERSION_LONG "${PROGRAM_VERSION} ${PROGRAM_LONG_VERSION}" CACHE STRING "version of the current project with git information" FORCE)
+		message(STATUS "Program ${projectName} long version ${PROGRAM_VERSION_LONG}")
 	else()
 		set(PROGRAM_VERSION_LONG "${PROGRAM_VERSION}" CACHE STRING "version of the current project with git information" FORCE)
 	endif()
diff --git a/install.sh b/install.sh
index 5d0e7f8ff5b2e62d9381dd64ac96990fabeca8cf..ba24b0f7be1e41a7ff4d274deaf013ceb5838feb 100755
--- a/install.sh
+++ b/install.sh
@@ -23,6 +23,13 @@ then
 	fi
 fi
 
+if [ -z "$2" ]
+then
+	extraCMakeOption=""
+else
+	extraCMakeOption="-D${2}=yes"
+fi
+
 export PATH=$INSTALL_PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH=$INSTALL_PREFIX/lib:$DYLD_LIBRARY_PATH
@@ -36,7 +43,7 @@ fi
 mkdir -p build
 cd build
 
-cmake .. -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
+cmake .. -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX ${extraCMakeOption}
 if [ $? != 0 ]
 then
 	echo "Error on cmake : exit -1"