From 016b9ffc7d23b3c9b8f39925e763b3bb7c373a0a Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Mon, 6 May 2024 18:10:21 +0300 Subject: [PATCH 1/4] Experimenting --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b74242a..18e3e2b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,8 @@ jobs: - os: windows-latest compiler: msvc - os: macos-latest - compiler: gcc + compiler: llvm-17 + # compiler: gcc # - os: macos-latest # compiler: clang From 4bc0cea772084244b4732f089ee1fe712f46ec1e Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Mon, 6 May 2024 18:18:17 +0300 Subject: [PATCH 2/4] Experimenting --- .github/workflows/ci.yaml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 18e3e2b..55334f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,14 +12,14 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest - compiler: gcc - - os: ubuntu-latest - compiler: clang - - os: windows-latest - compiler: msvc + # - os: ubuntu-latest + # compiler: gcc + # - os: ubuntu-latest + # compiler: clang + # - os: windows-latest + # compiler: msvc - os: macos-latest - compiler: llvm-17 + compiler: # compiler: gcc # - os: macos-latest # compiler: clang @@ -54,6 +54,11 @@ jobs: vcpkg: true cppcheck: false + - name: Install compiler for Macos + if: startsWith(matrix.os, 'macos') + run: | + brew install llvm + - name: Prepare the PATH run: | if [[ "${{ runner.os }}" == "Windows" ]]; then From dee0c77cb173a344eee760657aaa6db672f93490 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Mon, 6 May 2024 18:33:14 +0300 Subject: [PATCH 3/4] Experimenting --- src/CMakeLists.txt | 5 ----- tests/CMakeLists.txt | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fa1347b..5cca8f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,16 +32,11 @@ if (MYSQLPOOL_LOGDEP) add_dependencies(${PROJECT_NAME} ${MYSQLPOOL_LOGDEP}) endif() -if(NOT MSVC) - set(STANDARD_FS_LIB stdc++fs) -endif() - target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB - ${STANDARD_FS_LIB} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4be7447..710ca8c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,11 +45,6 @@ target_include_directories(unit_tests target_link_libraries(unit_tests ${GTEST_LIBRARIES} mysqlpool - # ${Boost_LIBRARIES} - # ${ZLIB_LIBRARIES} - # ${OPENSSL_LIBRARIES} - # stdc++fs - # ${CMAKE_THREAD_LIBS_INIT} ) add_test(NAME unit_tests COMMAND unit_tests) @@ -83,11 +78,6 @@ target_include_directories(integration_tests target_link_libraries(integration_tests ${GTEST_LIBRARIES} mysqlpool - # ${Boost_LIBRARIES} - # ${ZLIB_LIBRARIES} - # ${OPENSSL_LIBRARIES} - # stdc++fs - # ${CMAKE_THREAD_LIBS_INIT} ) add_test(NAME integration_tests COMMAND integration_tests) From 5294a686471a10536b99bcf08a8fcb2144594337 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Mon, 6 May 2024 18:48:58 +0300 Subject: [PATCH 4/4] Experimenting --- .github/workflows/ci.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55334f6..7d05283 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,17 +12,14 @@ jobs: strategy: matrix: include: - # - os: ubuntu-latest - # compiler: gcc - # - os: ubuntu-latest - # compiler: clang - # - os: windows-latest - # compiler: msvc + - os: ubuntu-latest + compiler: gcc + - os: ubuntu-latest + compiler: clang + - os: windows-latest + compiler: msvc - os: macos-latest compiler: - # compiler: gcc - # - os: macos-latest - # compiler: clang steps: - name: Checkout code