mirror of
https://github.com/microsoft/GSL.git
synced 2025-04-23 17:45:31 -04:00
Compare commits
No commits in common. "cf46aeda1b444fa3533a196a6045c89c3e3deee1" and "9fc6cc7cbc125506d773a8c3bfcf4a928c8e0e8e" have entirely different histories.
cf46aeda1b
...
9fc6cc7cbc
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
@ -38,7 +38,7 @@ jobs:
|
|||||||
echo "Emulator starting in background"
|
echo "Emulator starting in background"
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug ..
|
run: cmake -Werror=dev -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug ..
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build . --parallel
|
run: cmake --build . --parallel
|
||||||
|
9
.github/workflows/compilers.yml
vendored
9
.github/workflows/compilers.yml
vendored
@ -23,13 +23,6 @@ jobs:
|
|||||||
exclude:
|
exclude:
|
||||||
- gcc_version: 10
|
- gcc_version: 10
|
||||||
cxx_version: 23
|
cxx_version: 23
|
||||||
# https://github.com/google/googletest/issues/4232
|
|
||||||
# Looks like GoogleTest is not interested in making version 1.14
|
|
||||||
# work with gcc-12.
|
|
||||||
- gcc_version: 12
|
|
||||||
cxx_version: 20
|
|
||||||
- gcc_version: 12
|
|
||||||
cxx_version: 23
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@ -61,7 +54,7 @@ jobs:
|
|||||||
xcode:
|
xcode:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
xcode_version: [ '15.4' ]
|
xcode_version: [ '14.3.1', '15.4' ]
|
||||||
build_type: [ Debug, Release ]
|
build_type: [ Debug, Release ]
|
||||||
cxx_version: [ 14, 17, 20, 23 ]
|
cxx_version: [ 14, 17, 20, 23 ]
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
@ -110,7 +110,6 @@ if(MSVC) # MSVC or simulating MSVC
|
|||||||
-Wno-shift-sign-overflow # GTest gtest-port.h
|
-Wno-shift-sign-overflow # GTest gtest-port.h
|
||||||
-Wno-undef # GTest
|
-Wno-undef # GTest
|
||||||
-Wno-used-but-marked-unused # GTest EXPECT_DEATH
|
-Wno-used-but-marked-unused # GTest EXPECT_DEATH
|
||||||
-Wno-switch-default # GTest EXPECT_DEATH
|
|
||||||
$<$<EQUAL:${GSL_CXX_STANDARD},14>: # no support for [[maybe_unused]]
|
$<$<EQUAL:${GSL_CXX_STANDARD},14>: # no support for [[maybe_unused]]
|
||||||
-Wno-unused-member-function
|
-Wno-unused-member-function
|
||||||
-Wno-unused-variable
|
-Wno-unused-variable
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.13)
|
cmake_minimum_required(VERSION 3.0.2)
|
||||||
project(googletest-download NONE)
|
project(googletest-download NONE)
|
||||||
|
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
ExternalProject_Add(googletest
|
ExternalProject_Add(googletest
|
||||||
GIT_REPOSITORY https://github.com/google/googletest.git
|
GIT_REPOSITORY https://github.com/google/googletest.git
|
||||||
GIT_TAG v1.14.0
|
GIT_TAG 1b18723e874b256c1e39378c6774a90701d70f7a
|
||||||
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
|
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
|
||||||
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
|
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
|
||||||
CONFIGURE_COMMAND ""
|
CONFIGURE_COMMAND ""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user