Просмотр исходного кода

STYLE: BuildSystem: Remove git_protocol ivar and use EP_GIT_PROTOCOL

This global variable EP_GIT_PROTOCOL was introduced in the last
update of ExternalProjectDependency.
Jean-Christophe Fillion-Robin лет назад: 7
Родитель
Сommit
0621b4a40b

+ 1 - 1
CMake/ctkFunctionCheckoutRepo.cmake

@@ -14,7 +14,7 @@ function(ctkFunctionCheckoutRepo)
   endforeach()
   
   if(NOT _GIT_PROTOCOL)
-    set(_GIT_PROTOCOL ${git_protocol})
+    set(_GIT_PROTOCOL ${EP_GIT_PROTOCOL})
   endif()
   if(NOT _CHECKOUT_DIR)
     set(_CHECKOUT_DIR ${CMAKE_CURRENT_BINARY_DIR})

+ 1 - 1
CMakeExternals/CTKData.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED CTKData_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/CTKData.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/CTKData.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/DCMTK.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://git.dcmtk.org/dcmtk.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://git.dcmtk.org/dcmtk.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/ITK.cmake

@@ -37,7 +37,7 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://itk.org/ITK.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://itk.org/ITK.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/Log4Qt.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED Log4Qt_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/Log4Qt.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/Log4Qt.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/PythonQt.cmake

@@ -94,7 +94,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/PythonQt.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/PythonQt.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/QtSOAP.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED QtSOAP_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/QtSOAP.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/QtSOAP.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/QtTesting.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED QtTesting_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/QtTesting.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/QtTesting.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/VTK.cmake

@@ -37,7 +37,7 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://vtk.org/VTK.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://vtk.org/VTK.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/ZMQ.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED ZMQ_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/PatrickCheng/zeromq2.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/PatrickCheng/zeromq2.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/qRestAPI.cmake

@@ -36,7 +36,7 @@ if(NOT DEFINED ${proj}_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/qRestAPI.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/qRestAPI.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 1 - 1
CMakeExternals/qxmlrpc.cmake

@@ -38,7 +38,7 @@ if(NOT DEFINED qxmlrpc_DIR)
     set(location_args GIT_REPOSITORY ${${proj}_GIT_REPOSITORY}
                       GIT_TAG ${revision_tag})
   else()
-    set(location_args GIT_REPOSITORY "${git_protocol}://github.com/commontk/qxmlrpc.git"
+    set(location_args GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/commontk/qxmlrpc.git"
                       GIT_TAG ${revision_tag})
   endif()
 

+ 0 - 8
CMakeLists.txt

@@ -457,14 +457,6 @@ endif()
 #-----------------------------------------------------------------------------
 # Other options
 
-# Git protocol option
-option(CTK_USE_GIT_PROTOCOL "If behind a firewall turn this OFF to use https instead." ON)
-mark_as_advanced(CTK_USE_GIT_PROTOCOL)
-set(git_protocol "git")
-if(NOT CTK_USE_GIT_PROTOCOL)
-  set(git_protocol "https")
-endif()
-
 # Let's mark as advanced some default properties
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 mark_as_advanced(DART_TESTING_TIMEOUT)