diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2df948b..6bd01fc 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -6,6 +6,9 @@ jobs: build-android: name: NDK-C++${{matrix.std}}-${{matrix.abi}}-${{matrix.build_type}} runs-on: ubuntu-latest + defaults: + run: + shell: bash strategy: fail-fast: true matrix: @@ -22,7 +25,6 @@ jobs: version: 1.10.0 - name: Configure - shell: bash run: | cmake -S . -B build_${{matrix.abi}} \ -DANDROID_ABI=${{matrix.abi}} \ @@ -33,7 +35,8 @@ jobs: -DCMAKE_CXX_STANDARD=${{matrix.std}} \ -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \ - -G Ninja + -G Ninja \ + -Werror - name: Build run: | diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 59e13a4..956da57 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -68,7 +68,8 @@ jobs: -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install \ -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} \ - -G Ninja + -G Ninja \ + -Werror - name: Build run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1c28b4b..9e52c87 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -42,12 +42,13 @@ jobs: CXXFLAGS: -Wall -Wextra -Wsign-conversion -Wtautological-compare -Werror ${{env.CXXFLAGS}} run: | cmake -S . -B build_${{matrix.build_type}} \ - -G "${{matrix.generator}}" \ -DCMAKE_CXX_EXTENSIONS=OFF \ -DCMAKE_CXX_FLAGS_DEBUG=-pedantic-errors \ -DCMAKE_CXX_FLAGS_RELEASE=-pedantic-errors \ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ - -DCMAKE_CXX_STANDARD_REQUIRED=ON + -DCMAKE_CXX_STANDARD_REQUIRED=ON \ + -G "${{matrix.generator}}" \ + -Werror - name: Build run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1329c21..7578dee 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,8 @@ jobs: -DCMAKE_CXX_STANDARD_REQUIRED=ON ` -DCMAKE_INSTALL_PREFIX:PATH=./install ` -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} ` - -G "${{matrix.generator}}" + -G "${{matrix.generator}}" ` + -Werror - name: Build run: cmake --build build_${{matrix.build_type}} ` @@ -112,7 +113,8 @@ jobs: -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCMAKE_INSTALL_PREFIX:PATH=./install \ -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} \ - -G Ninja + -G Ninja \ + -Werror - name: Build run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index d37582b..e355184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,10 @@ if (POLICY CMP0063) cmake_policy (SET CMP0063 NEW) endif (POLICY CMP0063) +if (POLICY CMP0074) + cmake_policy (SET CMP0074 NEW) +endif (POLICY CMP0074) + project(glog VERSION 0.6.0 LANGUAGES CXX) set (CPACK_PACKAGE_NAME glog)