mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-27 04:11:05 +00:00
move code to qrenderdoc/CMakeLists.txt
This commit is contained in:
@@ -379,24 +379,6 @@ else ()
|
||||
set (CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
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")
|
||||
# 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_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})
|
||||
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")
|
||||
|
||||
@@ -227,6 +227,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_
|
||||
"QMAKE_CXXFLAGS+=-Wno-comma\n")
|
||||
endif()
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14.0)
|
||||
file(APPEND
|
||||
${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
|
||||
"QMAKE_CXXFLAGS += -Wno-error=template-id-cdtor\n")
|
||||
endif()
|
||||
|
||||
if(ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND)
|
||||
message(WARNING "!!!! Using the Wayland Qt platform in qrenderdoc is NOT SUPPORTED !!!!")
|
||||
file(APPEND
|
||||
|
||||
Reference in New Issue
Block a user