Skip to content
Snippets Groups Projects
Commit 871bebe1 authored by Jan Müller's avatar Jan Müller
Browse files

Merge branch 'feature/#378_Fix_CMakes_Qt_MOC_Suppressions' into 'develop'

Feature/#378 Remove Cmakes qt moc suppressions

See merge request VR-Group/Project_Phoenix!112
parents 4a877784 2847383c
No related branches found
No related tags found
1 merge request!112Feature/#378 Remove Cmakes qt moc suppressions
...@@ -56,23 +56,6 @@ set(WARNING_LEVELS_RWTH_MSVC ...@@ -56,23 +56,6 @@ set(WARNING_LEVELS_RWTH_MSVC
"$<$<CXX_COMPILER_ID:MSVC>:/w14312>" "$<$<CXX_COMPILER_ID:MSVC>:/w14312>"
) )
# flags for overriding warning levels for files generated by Qt's MOC
set(WARNING_LEVELS_RWTH_CLANG_QT_MOC_OVERRIDE
-Wno-padded
-Wno-undefined-reinterpret-cast
)
set(WARNING_LEVELS_RWTH_GCC_QT_MOC_OVERRIDE
-Wno-padded
-Wno-undefined-reinterpret-cast
)
set(WARNING_LEVELS_RWTH_MSVC_QT_MOC_OVERRIDE
-W0
)
# compiler identification # compiler identification
if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND
CMAKE_CXX_COMPILER_ID MATCHES "Clang") CMAKE_CXX_COMPILER_ID MATCHES "Clang")
...@@ -107,25 +90,10 @@ macro(SET_WARNING_LEVELS_RWTH TARGET) ...@@ -107,25 +90,10 @@ macro(SET_WARNING_LEVELS_RWTH TARGET)
if(IS_CLANG) if(IS_CLANG)
target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_CLANG}) target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_CLANG})
if (CMAKE_AUTOMOC)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_autogen/moc_compilation.cpp
PROPERTIES COMPILE_FLAGS ${WARNING_LEVELS_RWTH_CLANG_QT_MOC_OVERRIDE})
endif ()
elseif(IS_GCC) elseif(IS_GCC)
target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_GCC}) target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_GCC})
if (CMAKE_AUTOMOC)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_autogen/moc_compilation.cpp
PROPERTIES COMPILE_FLAGS ${WARNING_LEVELS_RWTH_GCC_QT_MOC_OVERRIDE})
endif ()
elseif(IS_MSVC) elseif(IS_MSVC)
target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_MSVC}) target_compile_options(${TARGET} PRIVATE ${WARNING_LEVELS_RWTH_MSVC})
if (CMAKE_AUTOMOC)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${target}_autogen/moc_compilation.cpp
PROPERTIES COMPILE_FLAGS ${WARNING_LEVELS_RWTH_MSVC_QT_MOC_OVERRIDE})
endif ()
else() else()
message(WARNING "SET_WARNING_LEVELS_RWTH not implemented for your compiler. " message(WARNING "SET_WARNING_LEVELS_RWTH not implemented for your compiler. "
"Implement it to support our no-warning policy.") "Implement it to support our no-warning policy.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment