From 239352ad88a6533bbeb317b2f8ce57f34fdcb637 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 5 May 2018 20:52:41 +0800 Subject: [PATCH 1/2] Print warning about cmake support status --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c77a0f723..d4627b076 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.5) cmake_policy(VERSION 3.5) +message(WARNING "No official support for cmake build system. If it is broken, please submit patches!") + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) include(FunctionReadVersion) From 051ba4fa48168a101c26d7179fb50823fcd4987a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 5 May 2018 20:57:05 +0800 Subject: [PATCH 2/2] Comment out Werror flag in cmake script Werror flag should be only enabled on developer's machine, not for users using the product. Also fix formatting. --- cmake/Modules/MacroQbtCompilerSettings.cmake | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cmake/Modules/MacroQbtCompilerSettings.cmake b/cmake/Modules/MacroQbtCompilerSettings.cmake index 455cd09e6..6468e7db3 100644 --- a/cmake/Modules/MacroQbtCompilerSettings.cmake +++ b/cmake/Modules/MacroQbtCompilerSettings.cmake @@ -11,18 +11,17 @@ macro(qbt_set_compiler_options) #-Wshadow -Wconversion ? set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra" "-Wfloat-equal -Wcast-qual -Wcast-align" - "-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long" -# -fstack-protector-all - "-Werror -Wno-error=deprecated-declarations" + "-Wsign-conversion -Winvalid-pch -Wno-long-long" + #"-fstack-protector-all" + #"-Werror -Wno-error=deprecated-declarations" ) - set (_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" + set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" "-Woverloaded-virtual -Wold-style-cast" "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align" - "-Werror=overloaded-virtual" - # "-Weffc++" - "-Werror -Wno-error=cpp" + #"-Weffc++" + #"-Werror -Wno-error=cpp" # we should modify code to make these ones obsolete - "-Wno-error=sign-conversion -Wno-error=float-equal" + #"-Wno-error=sign-conversion -Wno-error=float-equal" ) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)