From cafca86bbf45ae5bbfe2767c9ee00bfcf4fb7ac9 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 12 Apr 2019 11:12:58 +0200 Subject: [PATCH 1/3] removed ascii from file formats --- python/src/Detector.h | 4 ---- 1 file changed, 4 deletions(-) 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: From c16b19ed1fcf10b84490aa0835604a6db16a24fb Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 12 Apr 2019 11:31:03 +0200 Subject: [PATCH 2/3] supress waring on gcc<6 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 858528c56..014e5f84c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") message(FATAL_ERROR "GCC version must be at least 4.8!") endif() target_compile_options(slsProjectWarnings INTERFACE - + -Wno-missing-field-initializers ) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) target_compile_options(slsProjectWarnings INTERFACE From 77c1ffffb1cd39b54b2ec5d224347313ba5ad62e Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 12 Apr 2019 11:32:46 +0200 Subject: [PATCH 3/3] fix --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 014e5f84c..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 - -Wno-missing-field-initializers - ) + + 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