STYLE: clean git tests

CMake/External_qt4.cmake

@@ -14,10 +14,6 @@ else()
   set(QT4_SB_BUILD_DIR ${CMAKE_BINARY_DIR}/${proj}/build)
   set(QT4_SB_SRC ${CMAKE_BINARY_DIR}/${proj}/src/${proj})
   
-  if(NOT DEFINED git_protocol)
-    set(git_protocol "git")
-  endif()
-  
   #activate only required components for Qt4
   set(QT4_SB_CONFIG -no-phonon-backend -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support)
 
@@ -44,8 +40,6 @@ else()
     PREFIX ${proj}
     URL "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
     URL_MD5 2edbe4d6c2eff33ef91732602f3518eb
-    #GIT_REPOSITORY "${git_protocol}://gitorious.org/qt/qt.git"
-    #GIT_TAG dde0c2f4f6d72bcc9db732eb51399395ffc37778
     BINARY_DIR ${QT4_SB_BUILD_DIR}
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
     CONFIGURE_COMMAND
@@ -71,4 +65,4 @@ else()
 
   message(STATUS "  Using Qt4 SuperBuild version")
 
-endif()
\ No newline at end of file
+endif()

CMake/External_zlib.cmake

@@ -14,48 +14,21 @@ else()
   set(ZLIB_SB_BUILD_DIR ${CMAKE_BINARY_DIR}/${proj}/build)
   set(ZLIB_SB_SRC ${CMAKE_BINARY_DIR}/${proj}/src/${proj})
   
+  # Try official release 1.2.8
+  ExternalProject_Add(${proj}
+    PREFIX ${proj}
+    URL "http://sourceforge.net/projects/libpng/files/zlib/1.2.8/zlib-1.2.8.tar.gz/download"
+    URL_MD5 44d667c142d7cda120332623eab69f40
+    BINARY_DIR ${ZLIB_SB_BUILD_DIR}
+    INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+    CMAKE_CACHE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+      -DCMAKE_BUILD_TYPE:STRING=Release
+      #-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+      #-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+      -DBUILD_SHARED_LIBS:BOOL=ON
+  )
   
-    if (TRUE)
-      # Try official release 1.2.8
-      ExternalProject_Add(${proj}
-        PREFIX ${proj}
-        URL "http://sourceforge.net/projects/libpng/files/zlib/1.2.8/zlib-1.2.8.tar.gz/download"
-        URL_MD5 44d667c142d7cda120332623eab69f40
-        BINARY_DIR ${ZLIB_SB_BUILD_DIR}
-        INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-        CMAKE_CACHE_ARGS
-          -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-          -DCMAKE_BUILD_TYPE:STRING=Release
-          #-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-          #-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-          -DBUILD_SHARED_LIBS:BOOL=ON
-      )
-        
-      else()
-        if(NOT DEFINED git_protocol)
-            set(git_protocol "git")
-        endif()
-      
-        # Beware : this is an old version of Zlib (1.2.3)
-        ExternalProject_Add(${proj}
-            PREFIX ${proj}
-            GIT_REPOSITORY "${git_protocol}://github.com/commontk/zlib.git"
-            GIT_TAG "66a753054b356da85e1838a081aa94287226823e"
-            BINARY_DIR ${ZLIB_SB_BUILD_DIR}
-            INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-            CMAKE_CACHE_ARGS
-            ## CXX should not be needed, but it a cmake default test
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_BUILD_TYPE:STRING=Release
-            -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-            -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-            #-DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
-            #-DZLIB_MANGLE_PREFIX:STRING=otb_zlib_
-            -DBUILD_SHARED_LIBS:BOOL=ON
-        )
-        
-      endif()
-      
     if(MSVC)
       ExternalProject_Add_Step(${proj} msvc_copy_hell
         COMMAND ${CMAKE_COMMAND} -E copy ${ZLIB_SB_BUILD_DIR}/zlib.lib ${CMAKE_INSTALL_PREFIX}/lib/zdll.lib