edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7149 from heinrich5991/pr_ddnet_cmakelists_cleanup

Browse source 
Don't compile `.h.in`, remove C compiler flags
This commit is contained in:
Dennis Felsing 2023-09-08 09:43:30 +00:00 committed by GitHub
parent e5e7e76ce5 cebc472cbe
commit 4108ccd55c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -299,10 +299,6 @@ if(NOT MSVC AND NOT HAIKU)
endif()
add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wall)
add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN
$<$<COMPILE_LANGUAGE:C>:-Wdeclaration-after-statement>
-Wdeclaration-after-statement
)
add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wextra)
add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-psabi) # parameter passing for argument of type ‘__gnu_cxx::__normal_iterator<CCommandProcessorFragment_Vulkan::SMemoryBlock<1>*, std::vector<CCommandProcessorFragment_Vulkan::SMemoryBlock<1>, std::allocator<CCommandProcessorFragment_Vulkan::SMemoryBlock<1> > > >’ changed in GCC 7.1
add_cxx_compiler_flag_if_supported(OUR_FLAGS_OWN -Wno-unused-parameter)
@ -380,7 +376,7 @@ function(set_glob VAR GLOBBING EXTS DIRECTORY) # ...
endfunction()
function(set_src VAR GLOBBING DIRECTORY) # ...
set_glob(${VAR} ${GLOBBING} "c;cpp;h;h.in" ${DIRECTORY} ${ARGN})
set_glob(${VAR} ${GLOBBING} "c;cpp;h" ${DIRECTORY} ${ARGN})
set(${VAR} ${${VAR}} PARENT_SCOPE)
set(CHECKSUM_SRC ${CHECKSUM_SRC} ${${VAR}} PARENT_SCOPE)
endfunction()
@ -1996,7 +1992,6 @@ set_src(GAME_SHARED GLOB src/game
teamscore.h
tuning.h
variables.h
version.h.in
voting.h
)
# A bit hacky, but these are needed to register all the UUIDs, even for stuff