diff --git a/CMakeLists.txt b/CMakeLists.txt index 858528c56..1b6eb68c3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,9 +80,12 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) message(FATAL_ERROR "GCC version must be at least 4.8!") endif() - target_compile_options(slsProjectWarnings INTERFACE - - ) + + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) + target_compile_options(slsProjectWarnings INTERFACE + -Wno-missing-field-initializers) + endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) target_compile_options(slsProjectWarnings INTERFACE -Wno-misleading-indentation # mostly in rapidjson remove using clang format diff --git a/python/src/Detector.h b/python/src/Detector.h index ea9225642..9dc574bc6 100755 --- a/python/src/Detector.h +++ b/python/src/Detector.h @@ -676,8 +676,6 @@ class Detector { void Detector::setFileFormat(const std::string &format) { if (format == "binary") { det.setFileFormat(slsDetectorDefs::fileFormat::BINARY); - } else if (format == "ascii") { - det.setFileFormat(slsDetectorDefs::fileFormat::ASCII); } else if (format == "hdf5") { det.setFileFormat(slsDetectorDefs::fileFormat::HDF5); } @@ -689,8 +687,6 @@ std::string Detector::getFileFormat() { switch (format) { case slsDetectorDefs::fileFormat::BINARY: return "binary"; - case slsDetectorDefs::fileFormat::ASCII: - return "ascii"; case slsDetectorDefs::fileFormat::HDF5: return "hdf5"; default: