Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2312 from psychon/travis-Werror 

Another attempt at making -Werror work on Travis
This commit is contained in:
mergify[bot] 2018-07-29 21:10:07 +00:00 committed by GitHub
parent 321eb30ea4 0060d1149b
commit 0d994c0603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -157,7 +157,7 @@ install:
return 0 return 0
} }
script: script:
- export CMAKE_ARGS="-DLUA_LIBRARY=${LUALIBRARY} -DLUA_INCLUDE_DIR=${LUAINCLUDE} -D OVERRIDE_VERSION=$AWESOME_VERSION -DSTRICT_TESTS=true -D DO_COVERAGE=$DO_COVERAGE" - export CMAKE_ARGS="-DLUA_LIBRARY=${LUALIBRARY} -DLUA_INCLUDE_DIR=${LUAINCLUDE} -D OVERRIDE_VERSION=$AWESOME_VERSION -DSTRICT_TESTS=true -D DO_COVERAGE=$DO_COVERAGE -D CMAKE_C_FLAGS=-Werror"
- | - |
if [ "$EMPTY_THEME_WHILE_LOADING" = 1 ]; then if [ "$EMPTY_THEME_WHILE_LOADING" = 1 ]; then
# Break beautiful so that trying to access the theme before beautiful.init() causes an error # Break beautiful so that trying to access the theme before beautiful.init() causes an error

8
awesomeConfig.cmake
View File

@ -158,8 +158,8 @@ set(AWESOME_DEPENDENCIES
pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES}) pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES})
# Check for backtrace_symbols() # Check for backtrace_symbols()
include(CheckFunctionExists) include(CheckSymbolExists)
check_function_exists(backtrace_symbols HAS_EXECINFO) check_symbol_exists(backtrace_symbols execinfo.h HAS_EXECINFO)
if(NOT HAS_EXECINFO) if(NOT HAS_EXECINFO)
find_library(LIB_EXECINFO execinfo) find_library(LIB_EXECINFO execinfo)
if(LIB_EXECINFO) if(LIB_EXECINFO)
@ -176,11 +176,11 @@ else()
endif() endif()
# Do we need libm for round()? # Do we need libm for round()?
check_function_exists(round HAS_ROUND_WITHOUT_LIBM) check_symbol_exists(round math.h HAS_ROUND_WITHOUT_LIBM)
if(NOT HAS_ROUND_WITHOUT_LIBM) if(NOT HAS_ROUND_WITHOUT_LIBM)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} m) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} m)
set(AWESOME_REQUIRED_LDFLAGS ${AWESOME_REQUIRED_LDFLAGS} m) set(AWESOME_REQUIRED_LDFLAGS ${AWESOME_REQUIRED_LDFLAGS} m)
check_function_exists(round HAS_ROUND_WITH_LIBM) check_symbol_exists(round math.h HAS_ROUND_WITH_LIBM)
if(NOT HAS_ROUND_WITH_LIBM) if(NOT HAS_ROUND_WITH_LIBM)
message(FATAL_ERROR "Did not find round()") message(FATAL_ERROR "Did not find round()")
endif() endif()