|
@@ -527,26 +527,6 @@ set_option(SDL_INSTALL_TESTS "Install test-cases" OFF)
|
|
|
|
|
|
set(HAVE_STATIC_PIC "${SDL_STATIC_PIC}")
|
|
|
|
|
|
-if(SDL_WERROR)
|
|
|
- if(MSVC)
|
|
|
- cmake_push_check_state(RESET)
|
|
|
- check_c_compiler_flag(/WX HAVE_WX)
|
|
|
- if(HAVE_WX)
|
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
|
|
- endif()
|
|
|
- elseif(USE_GCC OR USE_CLANG)
|
|
|
- cmake_push_check_state(RESET)
|
|
|
- check_c_compiler_flag(-Werror HAVE_WERROR)
|
|
|
- if(HAVE_WERROR)
|
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
|
|
- set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} -Werror")
|
|
|
- endif()
|
|
|
- cmake_pop_check_state()
|
|
|
- endif()
|
|
|
-endif()
|
|
|
-
|
|
|
if(SDL_HIDAPI)
|
|
|
if(HIDAPI_ONLY_LIBUSB)
|
|
|
set(SDL_HIDAPI_LIBUSB ON CACHE BOOL "" FORCE)
|
|
@@ -2926,6 +2906,26 @@ if(NOT SDLMAIN_SOURCES)
|
|
|
file(GLOB SDLMAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/dummy/*.c)
|
|
|
endif()
|
|
|
|
|
|
+if(SDL_WERROR)
|
|
|
+ if(MSVC)
|
|
|
+ cmake_push_check_state(RESET)
|
|
|
+ check_c_compiler_flag(/WX HAVE_WX)
|
|
|
+ if(HAVE_WX)
|
|
|
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
|
|
+ endif()
|
|
|
+ elseif(USE_GCC OR USE_CLANG)
|
|
|
+ cmake_push_check_state(RESET)
|
|
|
+ check_c_compiler_flag(-Werror HAVE_WERROR)
|
|
|
+ if(HAVE_WERROR)
|
|
|
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
|
|
+ set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} -Werror")
|
|
|
+ endif()
|
|
|
+ cmake_pop_check_state()
|
|
|
+ endif()
|
|
|
+endif()
|
|
|
+
|
|
|
# Append the -MMD -MT flags
|
|
|
# if(DEPENDENCY_TRACKING)
|
|
|
# if(COMPILER_IS_GNUCC)
|