From 2f7ebd461cdee784fdfdf56d154125a63aad7ac0 Mon Sep 17 00:00:00 2001 From: feng716 Date: Sat, 6 Jul 2024 15:39:33 +0800 Subject: [PATCH] replace GREATER_EQUAL with GREATER GREATER_EQUAL is not supported in CMake 2.8 --- CMakeLists.txt | 2 +- qrenderdoc/qrenderdoc.pro | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 501e0e1cd..aa18780fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,7 +388,7 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR) list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR) message(STATUS "gcc-mj=${GCC_MAJOR}, gcc-mn=${GCC_MINOR}") - if(GCC_MAJOR GREATER_EQUAL "14") + if(GCC_MAJOR GREATER "13") execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-deprecated-declarations/a\\QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor" ${QRENDERDOCPRO}) message(STATUS "add option -Wno-error=template-id-cdtor") endif() diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index e4dd356db..c7deab90c 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -37,6 +37,7 @@ DEFINES += QT_NO_DEPRECATED_WARNINGS # HA HA good joke, QT_NO_DEPRECATED_WARNINGS only covers SOME warnings, not all QMAKE_CXXFLAGS += -Wno-deprecated-declarations +QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor # Different output folders per platform win32 {