From 33a0b4b295c26f619e2ad43c370d5f1aa5c6c298 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 27 Jan 2024 12:34:43 -0600 Subject: [PATCH] fix unittests link on mingw64 --- cmake/unittests.cmake | 5 +++++ docker/64_bit/mingw64 | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/unittests.cmake b/cmake/unittests.cmake index 69b09bba..c85a3475 100644 --- a/cmake/unittests.cmake +++ b/cmake/unittests.cmake @@ -14,6 +14,11 @@ if (REPERTORY_ENABLE_TESTING) if (MINGW) find_package(GTest REQUIRED) + set(GTEST_LIBRARIES + /mingw64/lib/libgmock.a + /mingw64/lib/libgtest.a + /mingw64/lib/libgtest_main.a + ) else() set(GTEST_PROJECT_NAME gtest_${GTEST_VERSION}) set(GTEST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${GTEST_PROJECT_NAME}) diff --git a/docker/64_bit/mingw64 b/docker/64_bit/mingw64 index 367eba0a..fe4e69db 100644 --- a/docker/64_bit/mingw64 +++ b/docker/64_bit/mingw64 @@ -948,8 +948,6 @@ RUN set -ex \ && cd build \ && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=ON \ -DCMAKE_INSTALL_PREFIX=${MY_MINGW} \ && make -j${MY_NUM_JOBS} \ && make install \