Change to build environment:

Do not search for mtca4u-deviceaccess any more. It has been renamed to ChimeraTK-DeviceAccess (and a compatibility layer was added only for cmake projects), but the library is anyway pulled in as a dependency by the ControlSystemAdapter base library.

README.md

@@ -47,18 +47,13 @@ Please copy `configure/EXAMPLE_RELEASE.local` to `configure/RELEASE.local` and
 adjust the path to EPICS Base.
 
 Usually, the build system automatically detects the correct compiler and linker
-flags. However, if the `ChimeraTK-ControlSystemAdapter-config` and
-`mtca4u-deviceaccess-config` scripts are not in the `PATH`, you have to specify
-the path to these scripts explicitly. In this case, please copy
-`configure/EXAMPLE_CONFIG_SITE.local` to `configure/CONFIG_SITE.local` and
-adjust the paths to these scripts.
+flags. However, if the `ChimeraTK-ControlSystemAdapter-config` script is not in
+the `PATH`, you have to specify the path to these scripts explicitly. In this
+case, please copy `configure/EXAMPLE_CONFIG_SITE.local` to
+`configure/CONFIG_SITE.local` and adjust the paths to these scripts.
 
 The ChimeraTK Control System Adapter for EPICS needs the
-[ChimeraTK Control System Adapter core library](https://github.com/ChimeraTK/ControlSystemAdapter/)
-and the
-[ChimeraTK Device Access library](https://github.com/ChimeraTK/DeviceAccess/).
-For historic reasons, the library provided by ChimeraTK Device Access
-is still called `mtca4u-DeviceAccess`.
+[ChimeraTK Control System Adapter core library](https://github.com/ChimeraTK/ControlSystemAdapter/).
 
 You need a compiler that supports C++ 14 in order to compile this device
 support. This should not be a limitation because recent versions of ChimeraTK

chimeraTKApp/src/Makefile

@@ -29,7 +29,6 @@ ChimeraTK-ControlSystemAdapter-EPICS_SRCS += registrar.cpp
 ChimeraTK-ControlSystemAdapter-EPICS_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 ChimeraTK-ControlSystemAdapter-EPICS_SYS_LIBS += ChimeraTK-ControlSystemAdapter
-ChimeraTK-ControlSystemAdapter-EPICS_SYS_LIBS += mtca4u-deviceaccess
 
 #===========================
 

configure/CONFIG_SITE

@@ -35,11 +35,6 @@ CHECK_RELEASE = YES
 # variable to the full path to the executable.
 CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG = ChimeraTK-ControlSystemAdapter-config
 
-# Path to the mtca4u-deviceaccess-config executable. By default, it is expected
-# to be in the PATH, but one can override this by setting this variable to the
-# full path to the executable.
-CHIMERATK_DEVICE_ACCESS_CONFIG = mtca4u-deviceaccess-config
-
 # Allow user to override settings locally.
 -include $(TOP)/configure/CONFIG_SITE.local
 
@@ -50,10 +45,8 @@ CHIMERATK_DEVICE_ACCESS_CONFIG = mtca4u-deviceaccess-config
 
 ifndef CHIMERATK_SKIP_CXXFLAGS
   USR_CXXFLAGS += $(shell $(CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG) --cppflags)
-  USR_CXXFLAGS += $(shell $(CHIMERATK_DEVICE_ACCESS_CONFIG) --cppflags)
 endif
 
 ifndef CHIMERATK_SKIP_LDFLAGS
   USR_LDFLAGS += $(shell $(CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG) --ldflags)
-  USR_LDFLAGS += $(shell $(CHIMERATK_DEVICE_ACCESS_CONFIG) --ldflags)
 endif

configure/EXAMPLE_CONFIG_SITE.local

@@ -2,6 +2,3 @@
 # define this, if it is not in the PATH.
 CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG = /path/to/ChimeraTK-ControlSystemAdapter-config
 
-# Path to the mtca4u-deviceaccess-config executable. You only have to define
-# this, if it is not in the PATH.
-CHIMERATK_DEVICE_ACCESS_CONFIG = /path/to/mtca4u-deviceaccess-config

examples/device-access/configure/CONFIG_SITE

@@ -40,11 +40,6 @@ CHECK_RELEASE = YES
 # variable to the full path to the executable in CONFIG_SITE.local.
 CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG = ChimeraTK-ControlSystemAdapter-config
 
-# Path to the mtca4u-deviceaccess-config executable. By default, it is expected
-# to be in the PATH, but one can override this by setting this variable to the
-# full path to the executable in CONFIG_SITE.local.
-CHIMERATK_DEVICE_ACCESS_CONFIG = mtca4u-deviceaccess-config
-
 # These allow developers to override the CONFIG_SITE variable
 # settings without having to modify the configure/CONFIG_SITE
 # file itself.
@@ -62,5 +57,4 @@ CHIMERATK_DEVICE_ACCESS_CONFIG = mtca4u-deviceaccess-config
 
 ifndef CHIMERATK_SKIP_LDFLAGS
   USR_LDFLAGS += $(shell $(CHIMERATK_CONTROL_SYSTEM_ADAPTER_CONFIG) --ldflags)
-  USR_LDFLAGS += $(shell $(CHIMERATK_DEVICE_ACCESS_CONFIG) --ldflags)
 endif