Skip to content

Commit

Permalink
GH-35186: [CI][C++] Improve GoogleTest detection on Windows + vcpkg (#…
Browse files Browse the repository at this point in the history
…35200)

### Rationale for this change

We must be able to use GoogleTest installed by vcpkg on Windows.

### What changes are included in this PR?

Add missing `-DCMAKE_CXX_STANDARD`.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

Yes.
* Closes: #35186

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
  • Loading branch information
kou authored Apr 18, 2023
1 parent a2548a7 commit 9f852d4
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions cpp/cmake_modules/FindGTestAlt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,14 @@ TEST(CXX_STANDARD, MatcherStringView) {
")
try_compile(GTestAlt_CXX_STANDARD_AVAILABLE ${CMAKE_CURRENT_BINARY_DIR}
SOURCES ${GTestAlt_CXX_STANDARD_TEST_SOURCE}
LINK_LIBRARIES GTest::gtest_main)
CMAKE_FLAGS "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
LINK_LIBRARIES GTest::gtest_main
OUTPUT_VARIABLE GTestAlt_CXX_STANDARD_OUTPUT)
set(CMAKE_TRY_COMPILE_TARGET_TYPE ${KEEP_CMAKE_TRY_COMPILE_TARGET_TYPE})
if(NOT GTestAlt_CXX_STANDARD_AVAILABLE)
message(STATUS "GTest can't be used with C++${CMAKE_CXX_STANDARD}. Use -DGTest_SOURCE=BUNDLED."
)
message(STATUS "GTest can't be used with C++${CMAKE_CXX_STANDARD}.")
message(STATUS "Use -DGTest_SOURCE=BUNDLED.")
message(STATUS "Output:\n${GTestAlt_CXX_STANDARD_OUTPUT}")
find_package_handle_standard_args(GTestAlt
REQUIRED_VARS GTestAlt_CXX_STANDARD_AVAILABLE)
endif()
Expand Down

0 comments on commit 9f852d4

Please sign in to comment.