1
0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-08-05 04:01:12 +03:00

Added WSREP_LIB_MAINTAINER_MODE cmake option

In order to avoid excessive build failures because of compiler
warnings, added WSREP_LIB_MAINTAINER_MODE cmake option which
must be enabled explicity in order to enable -Werror build flag.
This commit is contained in:
Teemu Ollakka
2019-01-24 17:57:23 +02:00
parent 28e52c8412
commit 2e4cebb9e9
2 changed files with 7 additions and 2 deletions

View File

@@ -239,6 +239,7 @@ before_install:
script: script:
- echo CC=${CC} CXX=${CXX} TYPE=${TYPE} STRICT=${STRICT} ASAN=${ASAN} DBSIM=${DBSIM} - echo CC=${CC} CXX=${CXX} TYPE=${TYPE} STRICT=${STRICT} ASAN=${ASAN} DBSIM=${DBSIM}
- cmake . -DCMAKE_BUILD_TYPE=${TYPE} - cmake . -DCMAKE_BUILD_TYPE=${TYPE}
-DWSREP_LIB_MAINTAINER_MODE:BOOL=ON
-DWSREP_LIB_STRICT_BUILD_FLAGS:BOOL=${STRICT} -DWSREP_LIB_STRICT_BUILD_FLAGS:BOOL=${STRICT}
-DWSREP_LIB_WITH_UNIT_TESTS:BOOL=ON -DWSREP_LIB_WITH_UNIT_TESTS:BOOL=ON
-DWSREP_LIB_WITH_DBSIM:BOOL=${DBSIM} -DWSREP_LIB_WITH_DBSIM:BOOL=${DBSIM}

View File

@@ -24,14 +24,18 @@ option(WSREP_LIB_WITH_TSAN "Enable thread sanitizer" OFF)
option(WSREP_LIB_WITH_DOCUMENTATION "Generate documentation" OFF) option(WSREP_LIB_WITH_DOCUMENTATION "Generate documentation" OFF)
option(WSREP_LIB_WITH_COVERAGE "Compile with coverage instrumentation" OFF) option(WSREP_LIB_WITH_COVERAGE "Compile with coverage instrumentation" OFF)
option(WSREP_LIB_STRICT_BUILD_FLAGS "Compile with strict build flags") option(WSREP_LIB_STRICT_BUILD_FLAGS "Compile with strict build flags" OFF)
option(WSREP_LIB_MAINTAINER_MODE "Fail compilation on any warnings" OFF)
# CXX flags # CXX flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Woverloaded-virtual -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Woverloaded-virtual -g")
if (WSREP_LIB_STRICT_BUILD_FLAGS) if (WSREP_LIB_STRICT_BUILD_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++")
endif() endif()
if (WSREP_LIB_MAINTAINER_MODE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
endif()
check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP) check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")