From 056a6ac37201cf07b8a964db379c0866864de0e5 Mon Sep 17 00:00:00 2001 From: "Mark A. Tsuchida" Date: Fri, 25 Aug 2023 15:43:27 -0500 Subject: [PATCH] Hack: Set Zaber to compile with C++17 (autotools) --- DeviceAdapters/Zaber/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DeviceAdapters/Zaber/Makefile.am b/DeviceAdapters/Zaber/Makefile.am index c891fe6b8..0f8f24692 100644 --- a/DeviceAdapters/Zaber/Makefile.am +++ b/DeviceAdapters/Zaber/Makefile.am @@ -1,4 +1,8 @@ -AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -I$(MMTHIRDPARTYPUBLIC)/Zaber/zaber-motion/include +# We require C++17 because libzml is C++17. Setting the C++ standard for +# individual device adapters is a hack and should not be imitated except when +# there is no other option. +AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -I$(MMTHIRDPARTYPUBLIC)/Zaber/zaber-motion/include -std=c++17 -Wno-dynamic-exception-spec + deviceadapter_LTLIBRARIES = libmmgr_dal_Zaber.la libmmgr_dal_Zaber_la_SOURCES = \ ObjectiveChanger.cpp \