Merge branch 'dev' into hidpi-icons

2018-12-13 00:52:07 +01:00
parent 81407cd663 d47a54fb3d
commit 8728142b64
57 changed files with 1929 additions and 1418 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -374,7 +374,7 @@ if(WITH_PROF)
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
 endif()

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Wno-deprecated-declarations -Wno-unused-result")
 if(OPTION_OMP)
    find_package(OpenMP)
    if(OPENMP_FOUND)