lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-11 20:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compatibity problem

Browse Source 
string sub-command REGEX mode MATCHALL does not support lists
This commit is contained in:
feng716
2024-07-06 16:11:20 +08:00
committed by Jake Turner
parent a339714159
commit 7bae53e098
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -5
View File
@@ -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})