diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-05 08:05:47 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-05 08:05:47 +0200 |
| commit | a590902a481e1e6d091938477a13916be9568e5b (patch) | |
| tree | 3af89bb39a9be030cb578d44f4f499a51ed5a2a4 | |
| parent | 8386de05073b9e38ec20625a7cd2b8396a3b64cf (diff) | |
| parent | 84d2a71f5c8c5efddb86ab311e1ab0ac5a7e910e (diff) | |
| download | libayatana-common-a590902a481e1e6d091938477a13916be9568e5b.tar.gz libayatana-common-a590902a481e1e6d091938477a13916be9568e5b.tar.bz2 libayatana-common-a590902a481e1e6d091938477a13916be9568e5b.zip | |
Merge branch 'tari01-pr/add-werror-cmake-option'
Attributes GH PR #33: https://github.com/AyatanaIndicators/libayatana-common/pull/33
| -rw-r--r-- | .build.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 4 deletions
@@ -105,9 +105,9 @@ build_scripts: - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - elif [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DENABLE_WERROR=ON - else - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi - else - exit 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 634bd55..d72cae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ set(ABI_VERSION 0) # Options option(ENABLE_TESTS "Enable all tests and checks" OFF) option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) +option(ENABLE_WERROR "Treat all build warnings as errors" OFF) if(ENABLE_COVERAGE) set(ENABLE_TESTS ON) @@ -22,6 +23,10 @@ else() set(CMAKE_BUILD_TYPE "Release") endif() +if(ENABLE_WERROR) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +endif() # GNU standard installation directories include (GNUInstallDirs) @@ -68,3 +73,4 @@ endif() message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "Unit tests: ${ENABLE_TESTS}") +message(STATUS "Build with -Werror: ${ENABLE_WERROR}") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4fa6602..0349ae6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,5 @@ find_package(GMock) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-pie") - # gschemas.compiled set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "gschemas.compiled") @@ -21,6 +19,7 @@ add_custom_target("gschemas-compiled" ALL DEPENDS "gschemas.compiled") add_executable(tst_utils tst_utils.cpp) target_compile_definitions(tst_utils PUBLIC SCHEMA_DIR="${CMAKE_CURRENT_BINARY_DIR}") +target_link_options(tst_utils PRIVATE -no-pie) add_dependencies(tst_utils "gschemas-compiled") target_include_directories(tst_utils PUBLIC "${CMAKE_SOURCE_DIR}/src") |