mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2024-12-02 17:12:15 +00:00
Merge branch '2.1.x' into master
This commit is contained in:
commit
0acfd81e28
1 changed files with 7 additions and 1 deletions
|
@ -146,6 +146,7 @@ endif ( POLICY CMP0063 )
|
||||||
include ( DefaultDirs )
|
include ( DefaultDirs )
|
||||||
|
|
||||||
# Basic C library checks
|
# Basic C library checks
|
||||||
|
include ( CheckCCompilerFlag )
|
||||||
include ( CheckSTDC )
|
include ( CheckSTDC )
|
||||||
include ( CheckIncludeFile )
|
include ( CheckIncludeFile )
|
||||||
include ( CheckFunctionExists )
|
include ( CheckFunctionExists )
|
||||||
|
@ -196,7 +197,12 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_C
|
||||||
endif ( NOT APPLE AND NOT OS2 )
|
endif ( NOT APPLE AND NOT OS2 )
|
||||||
|
|
||||||
# define some warning flags
|
# define some warning flags
|
||||||
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration -Werror=incompatible-pointer-types" )
|
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement -Werror=implicit-function-declaration" )
|
||||||
|
check_c_compiler_flag ( "-Werror=incompatible-pointer-types" HAVE_INCOMPATIBLE_POINTER_TYPES )
|
||||||
|
if ( HAVE_INCOMPATIBLE_POINTER_TYPES )
|
||||||
|
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=incompatible-pointer-types" )
|
||||||
|
endif ( HAVE_INCOMPATIBLE_POINTER_TYPES )
|
||||||
|
|
||||||
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wno-unused-parameter" )
|
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wno-unused-parameter" )
|
||||||
|
|
||||||
# prepend to build type specific flags, to allow users to override
|
# prepend to build type specific flags, to allow users to override
|
||||||
|
|
Loading…
Reference in a new issue