diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in
index f9e559e09c814d0afda7b8cbc6793f82da8155b2..2e73fdd40cc0f4e4ceae069ee25d20b8a9010800 100644
--- a/cmake/Doxyfile.in
+++ b/cmake/Doxyfile.in
@@ -263,12 +263,6 @@ TAB_SIZE               = 8
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -1140,13 +1134,6 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
diff --git a/cmake/set_control_system_adapter.cmake b/cmake/set_control_system_adapter.cmake
index a41750bdb03b3db8fc5d7b3cbe8dcd619e71f156..2a9ae13c9807fdd4aa95d01062ec09d6548f0e2a 100644
--- a/cmake/set_control_system_adapter.cmake
+++ b/cmake/set_control_system_adapter.cmake
@@ -46,10 +46,16 @@ elseif(ADAPTER STREQUAL "EPICS7IOC")
   find_package(ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter 02.01 REQUIRED)
   set_target_properties(ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter PROPERTIES IMPORTED_GLOBAL TRUE)
   add_library(ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-EPICS7-IOC-Adapter)
+elseif(ADAPTER STREQUAL "TANGO")
+  message("Building against the Tango ControlSystemAdater")
+  find_package(ChimeraTK-ControlSystemAdapter-TangoAdapter 01.00 REQUIRED)
+  set_target_properties(ChimeraTK::ChimeraTK-ControlSystemAdapter-TangoAdapter PROPERTIES IMPORTED_GLOBAL TRUE)
+  add_library(ChimeraTK::SelectedAdapter ALIAS ChimeraTK::ChimeraTK-ControlSystemAdapter-TangoAdapter)
 else()
   message(FATAL_ERROR "Please select your ControlSystemAdapter to use by passing to the cmake command line:\n"
                       "   -DADAPTER=DOOCS to build a DOOCS server\n"
                       "   -DADAPTER=OPCUA to build an OPC UA server\n"
                       "   -DADAPTER=EPICSIOC to build an EPICS ver. 3.16 IOC\n"
-                      "   -DADAPTER=EPICS7IOC to build an EPICS ver. 7.0 IOC")
+                      "   -DADAPTER=EPICS7IOC to build an EPICS ver. 7.0 IOC\n"
+                      "   -DADAPTER=TANGO to build a Tango device server")
 endif()