From 14763a8b316626d49fc3fe79fdf575a94c85b4de Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 1 Aug 2020 08:58:36 +0900 Subject: [PATCH 1/2] Fixed #905. Added compiler version cheking for atomic test for older compilers on cmake. --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7d761a..f78e5576 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,8 +115,11 @@ IF (GTEST_FOUND AND ZLIB_FOUND AND THREADS_FOUND AND NOT "${MSGPACK_FUZZ_REGRESS OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF) ENDIF () -INCLUDE (CheckCXXSourceCompiles) -CHECK_CXX_SOURCE_COMPILES (" + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.1) + INCLUDE (CheckCXXSourceCompiles) + CHECK_CXX_SOURCE_COMPILES (" #include int atomic_sub(int i) { return __gnu_cxx::__exchange_and_add(&i, -1) - 1; } int atomic_add(int i) { return __gnu_cxx::__exchange_and_add(&i, 1) + 1; } @@ -125,7 +128,11 @@ int main(int argc, char * argv[]) atomic_sub(1); atomic_add(1); } -" MSGPACK_ENABLE_GCC_CXX_ATOMIC) +" + MSGPACK_ENABLE_GCC_CXX_ATOMIC) + ENDIF () +ENDIF () + INCLUDE (Files.cmake) From d53d42a79113a67a51c9b1232fe0f5fff20e1469 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 1 Aug 2020 11:47:33 +0900 Subject: [PATCH 2/2] Added vcpkg update. --- .github/workflows/gha.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml index 5c854864..64d17fbf 100644 --- a/.github/workflows/gha.yml +++ b/.github/workflows/gha.yml @@ -248,6 +248,7 @@ jobs: if: steps.cache-vcpkg.outputs.cache-hit != 'true' shell: powershell run: | + vcpkg update vcpkg install gtest:x64-windows vcpkg install zlib:x64-windows - name: Build and test