Merge pull request #280 from CCPPETMR/cil_tags

updated CIL tags
SyneRBI · Nov 1, 2019 · ce798cb · ce798cb
2 parents 0102acc + 8e6d03a
commit ce798cb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/version_config.cmake b/version_config.cmake
@@ -177,7 +177,6 @@ if (DEVEL_BUILD)
   set(DEFAULT_ACE_URL https://github.com/paskino/libace-conda)
   set(DEFAULT_ACE_TAG origin/master)
   # CCPi CIL
-  #set(CIL_VERSION "19.06")
   set(DEFAULT_CCPi-Framework_URL https://github.com/vais-ral/CCPi-Framework.git)
   set(DEFAULT_CCPi-Framework_TAG origin/master)
   set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git)
@@ -211,12 +210,11 @@ else()
   set(DEFAULT_ACE_TAG origin/master)
 
   # CCPi CIL
-  set(CIL_VERSION "origin/master")
-  set(Regularisation-Toolkit_VERSION "19.10")
+  set(CIL_VERSION "v19.10")
   set(DEFAULT_CCPi-Framework_URL https://github.com/vais-ral/CCPi-Framework.git)
   set(DEFAULT_CCPi-Framework_TAG ${CIL_VERSION})
   set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git )
-  set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "${Regularisation-Toolkit_VERSION}")
+  set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "${CIL_VERSION}")
   set(DEFAULT_CCPi-FrameworkPlugins_URL https://github.com/vais-ral/CCPi-FrameworkPlugins.git)
   set(DEFAULT_CCPi-FrameworkPlugins_TAG "${CIL_VERSION}")
   set(DEFAULT_CCPi-Astra_URL https://github.com/vais-ral/CCPi-Astra.git)