Pass warning flags into qmake when building

This commit is contained in:
baldurk
2017-01-03 14:23:59 +00:00
parent c57dcce816
commit 28e5cd6b56
3 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -123,12 +123,12 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
list(APPEND warning_flags -Wno-unused-but-set-variable)
endif()
if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
list(APPEND warning_flags -Werror)
endif()
string(REPLACE ";" " " warning_flags "${warning_flags}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warning_flags}")
if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
endif()
endif()
if(ANDROID)
+1 -1
View File
@@ -18,7 +18,7 @@ endif()
# which causes CMake to rerun this target every time so that Qt
# can do dependency checking and rebuild anything necessary.
add_custom_command(OUTPUT QRenderDoc
COMMAND qmake "CONFIG+=${QMAKE_CONFIG}" "QMAKE_LFLAGS+=${QMAKE_LDFLAGS}" "DEFINES+=GIT_COMMIT_HASH_LITERAL=${GIT_COMMIT_HASH}" "DESTDIR=${output_dir}" ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND qmake "CONFIG+=${QMAKE_CONFIG}" "QMAKE_CXXFLAGS+=${warning_flags}" "QMAKE_LFLAGS+=${QMAKE_LDFLAGS}" "DEFINES+=GIT_COMMIT_HASH_LITERAL=${GIT_COMMIT_HASH}" "DESTDIR=${output_dir}" ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND MAKEFLAGS= make --no-print-directory)
add_custom_target(build-qrenderdoc ALL DEPENDS QRenderDoc DEPENDS renderdoc)
+1 -1
View File
@@ -77,7 +77,7 @@ win32 {
LIBS += -L$$DESTDIR -lrenderdoc
QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\''
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter -Wno-reorder
QMAKE_CXXFLAGS += -std=c++11
macx: {
DEFINES += RENDERDOC_PLATFORM_POSIX RENDERDOC_PLATFORM_APPLE