drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox] Add -Wshadow warning

Browse Source
This commit is contained in:
Gary Talent
2019-06-26 21:54:41 -05:00
parent 472249cd6d
commit 8730c6380c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
deps/ox/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.13)
project(Ox) project(Ox)
@@ -6,10 +6,10 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
include(address_sanitizer) include(address_sanitizer)
if(NOT DEFINED OX_RUN_TESTS) if(NOT DEFINED OX_RUN_TESTS)
set(OX_RUN_TESTS "ON") set(OX_RUN_TESTS ON)
endif() endif()
if(NOT DEFINED OX_RUN_TESTS) if(NOT DEFINED OX_BUILD_EXEC)
set(OX_RUN_TESTS "ON") set(OX_BUILD_EXEC ON)
endif() endif()
if(NOT DEFINED OX_USE_STDLIB) if(NOT DEFINED OX_USE_STDLIB)
set(OX_USE_STDLIB ON) set(OX_USE_STDLIB ON)
@@ -18,13 +18,13 @@ if(NOT DEFINED OX_BARE_METAL)
set(OX_BARE_METAL OFF) set(OX_BARE_METAL OFF)
endif() endif()
set(OX_RUN_TESTS ${OX_RUN_TESTS} CACHE STRING "Run tests (ON/OFF)") set(OX_RUN_TESTS ${OX_RUN_TESTS} CACHE BOOL "Run tests (ON/OFF)")
set(OX_RUN_TESTS ${OX_RUN_TESTS} CACHE STRING "Run tests (ON/OFF)") set(OX_BUILD_EXEC ${OX_BUILD_EXEC} CACHE BOOL "Build executables (ON/OFF)")
set(OX_USE_STDLIB ${OX_USE_STDLIB} CACHE STRING "Build libraries that need the std lib (ON/OFF)") set(OX_USE_STDLIB ${OX_USE_STDLIB} CACHE BOOL "Build libraries that need the std lib (ON/OFF)")
set(OX_BARE_METAL ${OX_BARE_METAL} CACHE STRING "Bare metal build (TRUE/FALSE)") set(OX_BARE_METAL ${OX_BARE_METAL} CACHE BOOL "Bare metal build (TRUE/FALSE)")
# can't run tests without building them # can't run tests without building them
if(OX_BUILD_EXEC STREQUAL "OFF" OR NOT ${OX_USE_STDLIB}) if(NOT OX_BUILD_EXEC OR NOT OX_USE_STDLIB)
set(OX_BUILD_EXEC OFF) set(OX_BUILD_EXEC OFF)
set(OX_RUN_TESTS OFF) set(OX_RUN_TESTS OFF)
endif() endif()
@@ -39,7 +39,7 @@ else()
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
endif() endif()
if(NOT ${OX_USE_STDLIB}) if(NOT OX_USE_STDLIB)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
endif() endif()
@@ -55,6 +55,7 @@ if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused")