lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add version determination

Browse Source
This commit is contained in:
feng716
2024-07-06 15:15:28 +08:00
committed by Jake Turner
parent 9c41ef366e
commit 3bd5f5a631
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+14
View File
@@ -379,6 +379,20 @@ else ()
set (CMAKE_CXX_STANDARD_REQUIRED ON)
endif ()
# Detect g++ version
if (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor/d" qrenderdoc/qrenderdoc.pro)
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)
message(STATUS "gcc-mj=${GCC_MAJOR}, gcc-mn=${GCC_MINOR}")
if(GCC_MAJOR GREATER_EQUAL "14")
execute_process(COMMAND sed -i "/QMAKE_CXXFLAGS += -Wno-deprecated-declarations/a\\QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor" qrenderdoc/qrenderdoc.pro)
message(STATUS "add option -Wno-error=template-id-cdtor")
endif()
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
qrenderdoc/qrenderdoc.pro
-1
View File
@@ -37,7 +37,6 @@ 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 {