From 7bae53e098d524642fe72f362af13695facda3a8 Mon Sep 17 00:00:00 2001 From: feng716 Date: Sat, 6 Jul 2024 16:11:20 +0800 Subject: [PATCH] fix compatibity problem string sub-command REGEX mode MATCHALL does not support lists --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa18780fc..7d994447c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -380,13 +380,16 @@ else () endif () # Detect g++ version +set(QRENDERDOCPRO "${PROJECT_SOURCE_DIR}/qrenderdoc/qrenderdoc.pro") +file(READ ${QRENDERDOCPRO} QRENDERDOCPRO_FILE) +string(REPLACE "QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor" "" QRENDERDOCPRO_FILE "${QRENDERDOCPRO_FILE}") +file(WRITE ${QRENDERDOCPRO} "${QRENDERDOCPRO_FILE}") if (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") - set(QRENDERDOCPRO "${PROJECT_SOURCE_DIR}/qrenderdoc/qrenderdoc.pro") - execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor/d" ${QRENDERDOCPRO}) + # execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor/d" ${QRENDERDOCPRO}) execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpfullversion OUTPUT_VARIABLE GCC_VERSION) - string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION}) - list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR) - list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR) + string(REGEX MATCHALL "[0-9]+" GCC_MAJOR GCC_MINOR GCC_NONE ${GCC_VERSION}) + # 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 "13") execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-deprecated-declarations/a\\QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor" ${QRENDERDOCPRO})