diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 058d30f..eb434e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,17 +23,20 @@ jobs: platform: [windows-latest, ubuntu-latest, macos-latest] include: - platform: windows-latest - CC: cl - CXX: cl - LD: link + CC: cl.exe + CXX: cl.exe + LD: link.exe + EXTRA_FLAGS: -DFRAMELESSHELPER_ENABLE_SPECTRE=ON -DFRAMELESSHELPER_ENABLE_EHCONTGUARD=ON -DFRAMELESSHELPER_ENABLE_INTELCET=ON -DFRAMELESSHELPER_ENABLE_CFGUARD=ON - platform: ubuntu-latest CC: gcc CXX: g++ LD: ld + EXTRA_FLAGS: -DFRAMELESSHELPER_ENABLE_SPECTRE=ON -DFRAMELESSHELPER_ENABLE_INTELCET=ON -DFRAMELESSHELPER_ENABLE_CFGUARD=ON - platform: macos-latest CC: /usr/local/opt/llvm/bin/clang CXX: /usr/local/opt/llvm/bin/clang++ LD: /usr/local/opt/llvm/bin/ld64.lld + EXTRA_FLAGS: -DFRAMELESSHELPER_ENABLE_UNIVERSAL_BUILD=OFF - library-type: shared lib_type_flag: -DFRAMELESSHELPER_BUILD_STATIC=OFF - library-type: static @@ -77,6 +80,6 @@ jobs: run: | mkdir ci cd ci - cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_LINKER=${{ matrix.LD }} -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release -DFRAMELESSHELPER_BUILD_EXAMPLES=ON ${{ matrix.lib_type_flag }} -GNinja .. + cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_LINKER=${{ matrix.LD }} -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release -DFRAMELESSHELPER_BUILD_EXAMPLES=ON ${{ matrix.lib_type_flag }} ${{ matrix.EXTRA_FLAGS }} -GNinja .. cmake --build . --target all --config Release --parallel cmake --install . --config Release --strip diff --git a/cmake b/cmake index f104a44..c706012 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f104a44a0a8f64ec38a7722d5ba20141f8d7cf6d +Subproject commit c70601249a22b84617e8ce7697351641701a1e50