Merge branch 'lintao/externals/integration-ckfbelle' into 'master'

Use the internal ckf by default.

See merge request !21

cmake/CEPCSWDependencies.cmake

@@ -36,4 +36,11 @@ find_package(PandoraSDK REQUIRED)
 find_package(podio REQUIRED)
 find_package(ROOT COMPONENTS EG Graf Graf3d Gpad MathCore Net RIO Tree TreePlayer REQUIRED)
 find_package(GenFit)
-find_package(BelleIICKF)
+
+if (CEPCSW_USE_SYSTEM_CKF_BELLE)
+  message("Try to use an existing installation of CKF BELLE")
+  find_package(BelleIICKF)
+else()
+  message("Try to use an internal installation of CKF BELLE")
+  include("${CMAKE_CURRENT_LIST_DIR}/internal_ckf.cmake")
+endif()

cmake/CEPCSWOptions.cmake

@@ -5,21 +5,6 @@
 ##############################################################################
 
 option(CEPCSW_USE_SYSTEM_CKF_BELLE 
-       "Use the existing installation of CKF BELLE"
-       TRUE)
+       "Use the existing installation of CKF BELLE. Otherwise the internal version will be used."
+       FALSE)
 
-if (CEPCSW_USE_SYSTEM_CKF_BELLE)
-  message("Try to use an existing installation of CKF BELLE")
-else()
-  message("Try to use an internal installation of CKF BELLE")
-
-  include(FetchContent)
-
-  FetchContent_Declare(
-    ckf_belle
-    GIT_REPOSITORY https://code.ihep.ac.cn/cepc/externals/ckf_belle.git
-    GIT_TAG        11624a552a9d2382bba3ce9ed9b0cf2d05a89b6e
-  )
-
-  FetchContent_MakeAvailable(ckf_belle)
-endif()

cmake/internal_ckf.cmake

+
+include(FetchContent)
+
+FetchContent_Declare(
+  ckf_belle
+  GIT_REPOSITORY https://code.ihep.ac.cn/cepc/externals/ckf_belle.git
+  GIT_TAG        72707998dfc4f7dbe4a91f995d03649cb217474d
+  )
+
+FetchContent_MakeAvailable(ckf_belle)